From c8128ba379cf72e5863bc4fcd7877d5ddd2e0361 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 4 Apr 2019 20:52:10 +0200
Subject: [PATCH 01/69] Refactor cart-like components for better re-use

---
 src/assets/scss/_cart.scss                    |  16 +-
 src/components/cartdetail/CartContent.vue     | 138 --------------
 .../cartdetail/LineItemDeleteForm.vue         |  26 +++
 .../cartdetail/LineItemQuantityForm.vue       |  69 +++++++
 src/components/cartdetail/PageCartDetail.vue  |  86 ++++++++-
 ...alculation.vue => CartLikePriceDetail.vue} |   0
 src/components/common/CartLikeSummary.vue     |  96 ++++++++++
 src/components/common/LineItem.vue            | 180 ------------------
 src/components/common/LineItemInfo.vue        |  54 ++++++
 src/components/common/ProductThumbnail.vue    |  10 +-
 src/components/header/MiniCart.vue            |  41 ++--
 .../useraccount/myorders/OrderDetail.vue      |  30 +--
 src/mixins/productMixin.js                    |   7 +
 13 files changed, 356 insertions(+), 397 deletions(-)
 delete mode 100644 src/components/cartdetail/CartContent.vue
 create mode 100644 src/components/cartdetail/LineItemDeleteForm.vue
 create mode 100644 src/components/cartdetail/LineItemQuantityForm.vue
 rename src/components/common/{PriceCalculation.vue => CartLikePriceDetail.vue} (100%)
 create mode 100644 src/components/common/CartLikeSummary.vue
 delete mode 100644 src/components/common/LineItem.vue
 create mode 100644 src/components/common/LineItemInfo.vue

diff --git a/src/assets/scss/_cart.scss b/src/assets/scss/_cart.scss
index 959a7724..b5d419e1 100755
--- a/src/assets/scss/_cart.scss
+++ b/src/assets/scss/_cart.scss
@@ -125,8 +125,12 @@
   height: 15px;
   margin-right: 0.5em;
 }
-.single-cart-item {
+
+.cart-content .single-cart-item {
   margin: 0 1em;
+}
+
+.single-cart-item {
   padding: 1em;
   border-bottom: 1px solid $alto;
 }
@@ -399,16 +403,10 @@
 }
 
 // MIN-WIDTH ------------------------------------------------------------------------------
-@media screen and (min-width: 991px) {
-  .single-cart-item {
-    height: 169px;
-    min-height: 169px;
-  }
-}
 @media screen and (min-width: 768px) {
   .single-cart-item {
-    min-height: 230px;
-    height: 230px;
+    min-height: 169px;
+    height: 169px;
     .cart-edit-delete {
       min-height: 100%;
       height: 100%;
diff --git a/src/components/cartdetail/CartContent.vue b/src/components/cartdetail/CartContent.vue
deleted file mode 100644
index 1c5a5bfc..00000000
--- a/src/components/cartdetail/CartContent.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <div v-if="me && me.activeCart">
-    <div class="row">
-      <div class="row text-uppercase hidden-xs cart-items-title">
-        <div class="col-sm-6">
-          <span>{{ $t('description') }}</span>
-        </div>
-        <div :class="!editable ? 'text-center' : ''"
-             class="col-sm-2">
-          <span>{{ $t('quantity') }}</span>
-        </div>
-        <div class="col-sm-2 text-right">
-          <span>{{ $t('price') }}</span>
-        </div>
-        <div class="col-sm-2 text-right">
-          <span>{{ $t('total') }}</span>
-        </div>
-      </div>
-    </div>
-    <LineItem v-for="lineItem in me.activeCart.lineItems"
-              :key="lineItem.id"
-              :lineItem="lineItem"
-              :editable="editable"
-              @removeLineItem="removeLineItem"
-              @changeLineItemQuantity="changeLineItemQuantity"/>
-    <!--{{> checkout/order-summary/discount-code-input}}-->
-    <!--{{> checkout/order-summary/discount-summary}}-->
-    <!--{{#if checkoutConfirmation}}-->
-    <!--{{> checkout/order-summary/confirmation-checkboxes}}-->
-    <!--{{/if}}-->
-  </div>
-</template>
-
-<script>
-import gql from 'graphql-tag';
-import cartMixin from '@/mixins/cartMixin';
-import priceMixin from '@/mixins/priceMixin';
-import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
-import LineItem from '../common/LineItem.vue';
-
-export default {
-  components: { LineItem },
-
-  props: {
-    editable: {
-      type: Boolean,
-      default: () => false,
-    },
-  },
-
-  data: () => ({
-    me: null,
-  }),
-
-  methods: {
-    removeLineItem(lineItemId) {
-      return this.updateMyCart([
-        {
-          removeLineItem: {
-            lineItemId,
-          },
-        },
-      ]);
-    },
-
-    changeLineItemQuantity(lineItemId, quantity) {
-      return this.updateMyCart([
-        {
-          changeLineItemQuantity: {
-            lineItemId,
-            quantity,
-          },
-        },
-      ]);
-    },
-  },
-
-  mixins: [cartMixin, priceMixin],
-
-  apollo: {
-    me: {
-      query: gql`
-        query me($locale: Locale!) {
-          me {
-            activeCart {
-              id
-              version
-              lineItems {
-                id
-                name(locale: $locale)
-                productSlug(locale: $locale)
-                quantity
-                price {
-                  value {
-                    ...DisplayableMoney
-                  }
-                  discounted {
-                    value {
-                      ...DisplayableMoney
-                    }
-                  }
-                }
-                totalPrice {
-                  ...DisplayableMoney
-                }
-                variant {
-                  sku
-                  images {
-                    url
-                  }
-                }
-              }
-            }
-          }
-        }
-        ${DisplayableMoneyFragment}`,
-      variables() {
-        return {
-          locale: this.$i18n.locale,
-        };
-      },
-    },
-  },
-};
-</script>
-
-<i18n>
-en:
-  description: "Description"
-  quantity: "Quantity"
-  price: "Price"
-  total: "Total"
-de:
-  description: "Beschreibung"
-  quantity: "Menge"
-  price: "Preis"
-  total: "Gesamtpreis"
-</i18n>
diff --git a/src/components/cartdetail/LineItemDeleteForm.vue b/src/components/cartdetail/LineItemDeleteForm.vue
new file mode 100644
index 00000000..4f07b1c8
--- /dev/null
+++ b/src/components/cartdetail/LineItemDeleteForm.vue
@@ -0,0 +1,26 @@
+<template>
+  <button @click="submit"
+          data-test="cart-line-item-delete">
+    <img src="../../assets/img/delete-1.png"
+         class="cart-action-icon"
+         :alt="$t('delete')">
+    <span class="delete-text">{{ $t('delete') }}</span>
+  </button>
+</template>
+
+<script>
+export default {
+  props: {
+    lineItem: {
+      type: Object,
+      required: true,
+    },
+  },
+
+  methods: {
+    submit() {
+      this.$emit('submit', this.lineItem.id);
+    },
+  },
+};
+</script>
diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
new file mode 100644
index 00000000..110aabdb
--- /dev/null
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="quantity-spinner">
+    <span @click="quantity -= 1"
+          data-test="cart-line-item-quantity-dec"
+          class="change-quantity-button input-number-decrement">–</span>
+    <input v-model.trim.number="$v.quantity.$model"
+           data-test="cart-line-item-quantity"
+           type="text"
+           class="input-number"/>
+    <span @click="quantity += 1"
+          data-test="cart-line-item-quantity-inc"
+          class="change-quantity-button input-number-increment">+</span>
+  </div>
+</template>
+
+<script>
+import debounce from 'lodash.debounce';
+import { required, minValue, numeric } from 'vuelidate/lib/validators';
+
+export default {
+  props: {
+    lineItem: {
+      type: Object,
+      required: true,
+    },
+  },
+
+  data: () => ({
+    quantity: null,
+  }),
+
+  methods: {
+    submit() {
+      this.$emit('submit', this.lineItem.id, this.quantity);
+    },
+  },
+
+  created() {
+    this.quantity = this.lineItem.quantity;
+    this.debouncedSubmit = debounce(this.submit, 500);
+  },
+
+  watch: {
+    quantity(newValue, oldValue) {
+      if (oldValue !== null) {
+        this.$v.$touch();
+        if (newValue !== oldValue && !this.$v.$invalid) {
+          this.debouncedSubmit();
+        }
+      }
+    },
+  },
+
+  validations: {
+    quantity: {
+      required,
+      numeric,
+      minValue: minValue(1),
+    },
+  },
+};
+</script>
+
+<style scoped>
+  .change-quantity-button {
+    margin: 1px;
+    border: 0;
+  }
+</style>
diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index 3c32e789..f80a4281 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -17,13 +17,25 @@
         <!--{{> checkout/start-checkout-link id="cart-checkoutnow-btn"}}-->
       </div>
     </div>
-    <div v-if="me && me.activeCart">
+    <div v-if="notEmpty">
       <div class="row">
         <div class="col-sm-12">
           <div class="cart-content">
-            <CartContent :editable="true"/>
-            <PriceCalculation :cartLike="me.activeCart"
-                              class="total-price-calc"/>
+            <CartLikeSummary :cart-like="me.activeCart">
+              <template #editable="{ lineItem }">
+                <div>
+                  <div class="col-sm-2 col-xs-12 cart-edit-delete">
+                    <div class="edit-delete-section">
+                      <LineItemDeleteForm :line-item="lineItem"
+                                          @submit="removeLineItem"/>
+                    </div>
+                  </div>
+                </div>
+                <LineItemQuantityForm :line-item="lineItem"
+                                      @submit="changeLineItemQuantity"
+                                      class="col-sm-2 col-xs-12 clearfix sm-pull-right"/>
+              </template>
+            </CartLikeSummary>
           </div>
         </div>
       </div>
@@ -48,12 +60,17 @@
 <script>
 import gql from 'graphql-tag';
 import cartMixin from '@/mixins/cartMixin';
-import CartContent from '@/components/cartdetail/CartContent.vue';
-import PriceCalculation from '@/components/common/PriceCalculation.vue';
+import CartLikeSummary from '../common/CartLikeSummary.vue';
+import LineItemDeleteForm from './LineItemDeleteForm.vue';
+import LineItemQuantityForm from './LineItemQuantityForm.vue';
 import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
 
 export default {
-  components: { CartContent, PriceCalculation },
+  components: {
+    LineItemQuantityForm,
+    LineItemDeleteForm,
+    CartLikeSummary,
+  },
 
   data: () => ({
     me: null,
@@ -61,19 +78,67 @@ export default {
 
   mixins: [cartMixin],
 
+  computed: {
+    notEmpty() {
+      return this.me && this.me.activeCart && this.me.activeCart.lineItems.length > 0;
+    },
+  },
+
+  methods: {
+    removeLineItem(lineItemId) {
+      return this.updateMyCart([
+        {
+          removeLineItem: {
+            lineItemId,
+          },
+        },
+      ]);
+    },
+
+    changeLineItemQuantity(lineItemId, quantity) {
+      return this.updateMyCart([
+        {
+          changeLineItemQuantity: {
+            lineItemId,
+            quantity,
+          },
+        },
+      ]);
+    },
+  },
+
   apollo: {
     me: {
       query: gql`
-        query me {
+        query me($locale: Locale!) {
           me {
             activeCart {
               id
+              version
               lineItems {
                 id
+                name(locale: $locale)
+                productSlug(locale: $locale)
                 quantity
+                price {
+                  value {
+                    ...DisplayableMoney
+                  }
+                  discounted {
+                    value {
+                      ...DisplayableMoney
+                    }
+                  }
+                }
                 totalPrice {
                   ...DisplayableMoney
                 }
+                variant {
+                  sku
+                  images {
+                    url
+                  }
+                }
               }
               totalPrice {
                ...DisplayableMoney
@@ -95,6 +160,11 @@ export default {
           }
         }
         ${DisplayableMoneyFragment}`,
+      variables() {
+        return {
+          locale: this.$i18n.locale,
+        };
+      },
     },
   },
 };
diff --git a/src/components/common/PriceCalculation.vue b/src/components/common/CartLikePriceDetail.vue
similarity index 100%
rename from src/components/common/PriceCalculation.vue
rename to src/components/common/CartLikePriceDetail.vue
diff --git a/src/components/common/CartLikeSummary.vue b/src/components/common/CartLikeSummary.vue
new file mode 100644
index 00000000..ba94603b
--- /dev/null
+++ b/src/components/common/CartLikeSummary.vue
@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <div class="row">
+      <div class="row text-uppercase hidden-xs cart-items-title">
+        <div class="col-sm-6">
+          <span>{{ $t('description') }}</span>
+        </div>
+        <div class="col-sm-2">
+          <span>{{ $t('quantity') }}</span>
+        </div>
+        <div class="col-sm-2 text-right">
+          <span>{{ $t('price') }}</span>
+        </div>
+        <div class="col-sm-2 text-right">
+          <span>{{ $t('total') }}</span>
+        </div>
+      </div>
+    </div>
+    <div v-for="lineItem in cartLike.lineItems"
+         :key="lineItem.id"
+         data-test="cart-line-item"
+         class="row single-cart-item">
+      <LineItemInfo :line-item="lineItem"
+                    class="col-sm-4 col-xs-12"/>
+      <slot name="editable"
+            :lineItem="lineItem">
+        <div class="col-sm-2 col-sm-offset-2 col-xs-12 text-center quantity-counter">
+          <span class="visible-xs">{{ $t('quantity') }}:</span>
+          <span data-test="cart-line-item-quantity"
+                class="quantity-number">
+                {{ lineItem.quantity }}
+              </span>
+        </div>
+      </slot>
+      <div>
+        <div class="col-sm-2 col-xs-12 sm-pull-right">
+          <div class="text-right cart-item-price">
+            <span class="visible-xs xs-price-title">{{ $t('price') }}</span>
+            <BasePrice :price="lineItem.price"/>
+          </div>
+        </div>
+        <div class="col-sm-2 col-xs-12 sm-pull-right">
+          <div class="text-right cart-item-price">
+            <span class="visible-xs xs-price-title">{{ $t('total') }}</span>
+            <span data-test="cart-line-item-total-price">
+          <BaseMoney :money="lineItem.totalPrice"/>
+        </span>
+          </div>
+        </div>
+      </div>
+      <!--{{> checkout/order-summary/discount-code-input}}-->
+      <!--{{> checkout/order-summary/discount-summary}}-->
+      <!--{{#if checkoutConfirmation}}-->
+      <!--{{> checkout/order-summary/confirmation-checkboxes}}-->
+      <!--{{/if}}-->
+    </div>
+    <CartLikePriceDetail :cartLike="cartLike"
+                         class="total-price-calc"/>
+  </div>
+</template>
+
+<script>
+import LineItemInfo from './LineItemInfo.vue';
+import CartLikePriceDetail from './CartLikePriceDetail.vue';
+import BasePrice from './BasePrice.vue';
+import BaseMoney from './BaseMoney.vue';
+
+export default {
+  components: {
+    BaseMoney,
+    BasePrice,
+    CartLikePriceDetail,
+    LineItemInfo,
+  },
+
+  props: {
+    cartLike: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>
+
+<i18n>
+en:
+  description: "Description"
+  quantity: "Quantity"
+  price: "Price"
+  total: "Total"
+de:
+  description: "Beschreibung"
+  quantity: "Menge"
+  price: "Preis"
+  total: "Gesamtpreis"
+</i18n>
diff --git a/src/components/common/LineItem.vue b/src/components/common/LineItem.vue
deleted file mode 100644
index ea74c357..00000000
--- a/src/components/common/LineItem.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <div data-test="cart-line-item"
-       class="row single-cart-item">
-    <div class="col-sm-1 col-xs-4 product-img-col">
-      <img :src="displayedImageUrl(lineItem.variant)"
-           :alt="lineItem.name"
-           class="img-responsive cart-item-img">
-    </div>
-    <div class="col-sm-3 col-xs-8 product-info-text">
-      <p class="cart-item-name">
-        <router-link data-test="cart-line-item-link"
-                     :to="{
-                     name: 'product',
-                     params: { productSlug: lineItem.productSlug, sku: lineItem.variant.sku }}">
-          {{ lineItem.name }}
-        </router-link>
-      </p>
-      <p class="grey-p"
-         data-test="cart-line-item-sku">
-        {{ lineItem.variant.sku }}
-      </p>
-      <!--<p class="cart-attributes">-->
-        <!--{{#each attributes}}-->
-        <!--{{name}}-->
-        <!--<span class="black-p" data-model="cartItem.{{key}}">{{value}}</span>-->
-        <!--{{#unless @last}}<br>{{/unless}}-->
-        <!--{{/each}}-->
-      <!--</p>-->
-      <!--<p class="cart-item-availability grey-p">-->
-        <!--<span class="glyphicon glyphicon-ok-sign"></span>{{ $t('catalog:availability.available') }}-->
-      <!--</p>-->
-    </div>
-
-    <div v-if="editable">
-      <div class="col-sm-2 col-xs-12 cart-edit-delete">
-        <div class="edit-section-options">
-          <div class="edit-delete-section">
-            <button @click="removeLineItem"
-                    data-test="cart-line-item-delete">
-              <img src="../../assets/img/delete-1.png"
-                   class="cart-action-icon"
-                   alt="delete">
-              {{ $t('delete') }}
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="col-sm-2 col-xs-12 clearfix">
-        <div class="sm-pull-right visible-xs">
-          <button class="quantity-submit-btn">
-            <span class="glyphicon glyphicon-refresh"></span>
-          </button>
-        </div>
-        <div class="sm-pull-right quantity-spinner">
-          <span @click="quantity -= 1"
-                data-test="cart-line-item-quantity-dec"
-                class="change-quantity-button input-number-decrement">–</span>
-          <input v-model.trim.number="$v.quantity.$model"
-                 data-test="cart-line-item-quantity"
-                 type="text"
-                 class="input-number"/>
-          <span @click="quantity += 1"
-                data-test="cart-line-item-quantity-inc"
-                class="change-quantity-button input-number-increment">+</span>
-        </div>
-      </div>
-    </div>
-    <div v-else
-         class="col-sm-2 col-sm-offset-2 col-xs-12 text-center quantity-counter">
-      <span class="visible-xs">{{ $t('quantity') }}:</span>
-      <span data-test="cart-line-item-quantity"
-            class="quantity-number">
-        {{ lineItem.quantity }}
-      </span>
-    </div>
-    <div :class="editable ? 'col-xs-12 sm-pull-right' : 'col-xs-7'"
-         class="col-sm-2">
-      <div class="text-right cart-item-price">
-        <span class="visible-xs xs-price-title">{{ $t('price') }}</span>
-        <BasePrice :price="lineItem.price"/>
-      </div>
-    </div>
-    <div :class="editable ? 'col-xs-12 sm-pull-right' : 'col-xs-5'"
-         class="col-sm-2">
-      <div class="text-right cart-item-price">
-        <span class="visible-xs xs-price-title">{{ $t('total') }}</span>
-        <span data-test="cart-line-item-total-price">
-          <BaseMoney :money="lineItem.totalPrice"/>
-        </span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import debounce from 'lodash.debounce';
-import priceMixin from '@/mixins/priceMixin';
-import productMixin from '@/mixins/productMixin';
-import { required, minValue, numeric } from 'vuelidate/lib/validators';
-import BaseMoney from './BaseMoney.vue';
-import BasePrice from './BasePrice.vue';
-
-export default {
-  components: {
-    BasePrice,
-    BaseMoney,
-  },
-
-  mixins: [priceMixin, productMixin],
-
-  props: {
-    lineItem: {
-      type: Object,
-      required: true,
-    },
-    editable: {
-      type: Boolean,
-      default: () => false,
-    },
-  },
-
-  data: () => ({
-    quantity: null,
-  }),
-
-  methods: {
-    changeLineItemQuantity() {
-      this.$emit('changeLineItemQuantity', this.lineItem.id, this.quantity);
-    },
-
-    removeLineItem() {
-      this.$emit('removeLineItem', this.lineItem.id);
-    },
-  },
-
-  created() {
-    this.quantity = this.lineItem.quantity;
-    this.debouncedChangeQuantity = debounce(this.changeLineItemQuantity, 500);
-  },
-
-  watch: {
-    quantity(newValue, oldValue) {
-      if (oldValue !== null) {
-        this.$v.$touch();
-        if (newValue !== oldValue && !this.$v.$invalid) {
-          this.debouncedChangeQuantity();
-        }
-      }
-    },
-  },
-
-  validations: {
-    quantity: {
-      required,
-      numeric,
-      minValue: minValue(1),
-    },
-  },
-};
-</script>
-
-<style scoped>
-  .change-quantity-button {
-    margin: 1px;
-    border: 0;
-  }
-</style>
-
-<i18n>
-en:
-  delete: "Delete"
-  quantity: "Quantity"
-  price: "Price"
-  total: "Total"
-de:
-  delete: "Löschen"
-  quantity: "Menge"
-  price: "Preis"
-  total: "Gesamtpreis"
-</i18n>
diff --git a/src/components/common/LineItemInfo.vue b/src/components/common/LineItemInfo.vue
new file mode 100644
index 00000000..34b05735
--- /dev/null
+++ b/src/components/common/LineItemInfo.vue
@@ -0,0 +1,54 @@
+<template>
+  <div>
+    <div class="col-sm-3 product-img-col">
+      <router-link :to="productRoute(lineItem.productSlug, lineItem.variant.sku)"
+                   class="img">
+        <img :src="displayedImageUrl(lineItem.variant)"
+             :alt="lineItem.name"
+             class="img-responsive img">
+      </router-link>
+    </div>
+    <div class="col-sm-8 product-info-text">
+      <p class="cart-item-name product-title">
+        <router-link :to="productRoute(lineItem.productSlug, lineItem.variant.sku)"
+                     data-test="cart-line-item-link">
+          {{ lineItem.name }}
+        </router-link>
+      </p>
+      <p v-if="extended"
+         class="grey-p"
+         data-test="cart-line-item-sku">
+        {{ lineItem.variant.sku }}
+      </p>
+      <!--<p class="cart-attributes">-->
+      <!--{{#each attributes}}-->
+      <!--{{name}}-->
+      <!--<span class="black-p" data-model="cartItem.{{key}}">{{value}}</span>-->
+      <!--{{#unless @last}}<br>{{/unless}}-->
+      <!--{{/each}}-->
+      <!--</p>-->
+      <!--<p class="cart-item-availability grey-p">-->
+      <!--<span class="glyphicon glyphicon-ok-sign"></span>{{ $t('catalog:availability.available') }}-->
+      <!--</p>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import productMixin from '@/mixins/productMixin';
+
+export default {
+  props: {
+    lineItem: {
+      type: Object,
+      required: true,
+    },
+    extended: {
+      type: Boolean,
+      default: () => true,
+    },
+  },
+
+  mixins: [productMixin],
+};
+</script>
diff --git a/src/components/common/ProductThumbnail.vue b/src/components/common/ProductThumbnail.vue
index 19077ca4..fa7d6916 100644
--- a/src/components/common/ProductThumbnail.vue
+++ b/src/components/common/ProductThumbnail.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="col-xs-12 col-sm-6 col-md-4">
-    <router-link :to="{ name: 'product', params: { productSlug, sku } }">
+    <router-link :to="productRoute(currentProduct.slug, matchingVariant.sku)">
       <div data-test="product-thumbnail"
            class="shop-item">
         <div v-if="hasPrice && hasDiscount"
@@ -120,14 +120,6 @@ export default {
     hasImages() {
       return Array.isArray(this.matchingVariant.images) && this.matchingVariant.images.length > 0;
     },
-
-    productSlug() {
-      return this.currentProduct.slug;
-    },
-
-    sku() {
-      return this.matchingVariant.sku;
-    },
   },
 
   mixins: [priceMixin, productMixin],
diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue
index 42f40019..9ec0effd 100644
--- a/src/components/header/MiniCart.vue
+++ b/src/components/header/MiniCart.vue
@@ -19,22 +19,8 @@
                 :key="lineItem.id"
                 data-test="mini-cart-line-item">
               <div>
-                <router-link :to="{
-                  name: 'product',
-                  params: { productSlug: lineItem.productSlug, sku: lineItem.variant.sku }}"
-                  class="img">
-                  <img :src="displayedImageUrl(lineItem.variant)"
-                       :alt="lineItem.name"
-                       class="img"/>
-                </router-link>
-                <router-link data-test="mini-cart-line-item-link"
-                             :to="{
-                             name: 'product',
-                             params: { productSlug: lineItem.productSlug, sku: lineItem.variant.sku }}">
-                  <p class="product-title">
-                    {{ lineItem.name }}
-                  </p>
-                </router-link>
+                <LineItemInfo :line-item="lineItem"
+                              :extended="false" />
                 <div class="details">
                   <p class="product-quantity">
                     {{ $t('quantity') }}
@@ -48,15 +34,8 @@
                       <BaseMoney :money="lineItem.totalPrice"/>
                     </span>
                   </p>
-                  <button @click="removeLineItem(lineItem.id)"
-                          data-test="mini-cart-line-item-delete"
-                          class="delete">
-                      <span>
-                        <img src="../../assets/img/delete-1.png"
-                             class="cart-action-icon"
-                             :alt="$t('delete')"/>
-                      </span>
-                  </button>
+                  <LineItemDeleteForm :line-item="lineItem"
+                                      @submit="removeLineItem"/>
                 </div>
               </div>
             </li>
@@ -72,7 +51,7 @@
                      class="btn-grey">
           {{ $t('viewBag') }}
         </router-link>
-        <router-link :to="{ name: 'cart' }"
+        <router-link :to="{ name: 'checkout' }"
                      class="btn-yellow">{{ $t('checkout') }}</router-link>
       </div>
     </transition>
@@ -88,9 +67,13 @@ import priceMixin from '@/mixins/priceMixin';
 import productMixin from '@/mixins/productMixin';
 import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
 import BaseMoney from '../common/BaseMoney.vue';
+import LineItemInfo from '../common/LineItemInfo.vue';
+import LineItemDeleteForm from '../cartdetail/LineItemDeleteForm.vue';
 
 export default {
   components: {
+    LineItemDeleteForm,
+    LineItemInfo,
     BaseMoney,
     VuePerfectScrollbar,
   },
@@ -187,6 +170,12 @@ export default {
 };
 </script>
 
+<style>
+.nav-minicart .delete-text {
+  display: none;
+}
+</style>
+
 <i18n>
   de:
     miniCart: "Warenkorb"
diff --git a/src/components/useraccount/myorders/OrderDetail.vue b/src/components/useraccount/myorders/OrderDetail.vue
index 17046ed7..9c703e62 100644
--- a/src/components/useraccount/myorders/OrderDetail.vue
+++ b/src/components/useraccount/myorders/OrderDetail.vue
@@ -35,29 +35,7 @@
           </button>
         </div>
         <ShipmentInfo />
-        <PriceCalculation :cartLike="me.order"
-                          class="my-orders-order-price-summary-wrapper"/>
-        <div class="order-list-summary-titles-wrapper">
-          <div class="row">
-            <div class="col-sm-6">
-              <div>{{ $t('description') }}</div>
-            </div>
-            <div class="col-sm-2">
-              <div class="text-right">{{ $t('quantity') }}</div>
-            </div>
-            <div class="col-sm-2">
-              <div class="text-right">{{ $t('price') }}</div>
-            </div>
-            <div class="col-sm-2">
-              <div class="text-right">{{ $t('total') }}</div>
-            </div>
-          </div>
-        </div>
-        <LineItem v-for="lineItem in me.order.lineItems"
-              :key="lineItem.id"
-              :lineItem="lineItem"
-              class="order-detail-wrapper"
-              data-test="order-line-items"/>
+        <CartLikeSummary :cart-like="me.order"/>
       </div>
       <div v-else>
         <h1 class="text-center">{{ $t('notFound') }}</h1>
@@ -70,16 +48,14 @@
 import gql from 'graphql-tag';
 import ShipmentInfo from './ShipmentInfo.vue';
 import BaseDate from '../../common/BaseDate.vue';
-import PriceCalculation from '../../common/PriceCalculation.vue';
-import LineItem from '../../common/LineItem.vue';
+import CartLikeSummary from '../../common/CartLikeSummary.vue';
 import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
 
 export default {
   components: {
+    CartLikeSummary,
     ShipmentInfo,
     BaseDate,
-    PriceCalculation,
-    LineItem,
   },
 
   data: () => ({
diff --git a/src/mixins/productMixin.js b/src/mixins/productMixin.js
index f74461ec..e57e9c4d 100644
--- a/src/mixins/productMixin.js
+++ b/src/mixins/productMixin.js
@@ -16,5 +16,12 @@ export default {
       }
       return null;
     },
+
+    productRoute(productSlug, sku) {
+      return {
+        name: 'product',
+        params: { productSlug, sku },
+      };
+    },
   },
 };

From 2bef178a0811eba418e69fb9ef9d06f9e92afe1f Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 4 Apr 2019 21:01:25 +0200
Subject: [PATCH 02/69] First draft for checkout shipping

---
 src/assets/scss/_checkout-shipping.scss       |  37 ++-
 src/components/checkout/CheckoutAddress.vue   |  71 ++++
 src/components/checkout/CheckoutCart.vue      | 308 ++++++++++++++++++
 src/router.js                                 |   9 +
 templates/partials/checkout/checkout-item.hbs | 112 -------
 .../checkout/order-summary-sidebar.hbs        |   5 -
 .../checkout/secure-checkout-title.hbs        |   4 -
 templates/partials/checkout/step-widget.hbs   |  14 -
 8 files changed, 408 insertions(+), 152 deletions(-)
 create mode 100644 src/components/checkout/CheckoutAddress.vue
 create mode 100644 src/components/checkout/CheckoutCart.vue
 delete mode 100644 templates/partials/checkout/checkout-item.hbs
 delete mode 100644 templates/partials/checkout/order-summary-sidebar.hbs
 delete mode 100644 templates/partials/checkout/secure-checkout-title.hbs
 delete mode 100644 templates/partials/checkout/step-widget.hbs

diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
index 06c3147d..41863c37 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -30,21 +30,24 @@
   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 0.5em 0 0.2em;
+  }
+
+  .active .step-number {
+    background: $silver-chalice;
+    color: $white;
+  }
 }
 
 // Shipping information
@@ -307,11 +310,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/components/checkout/CheckoutAddress.vue b/src/components/checkout/CheckoutAddress.vue
new file mode 100644
index 00000000..f4842335
--- /dev/null
+++ b/src/components/checkout/CheckoutAddress.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="checkout-shipping">
+    <div class="container">
+      <div class="row">
+        <div class="col-md-6">
+          <div class="secure-payment">
+            <span>
+              <img src="../../assets/img/credit-card-lock.png"
+                   class="secure-payment-icon"
+                   :alt="$t('securePayment')">
+            </span>
+            <span class="text-uppercase secure-payment-title">
+              <!--{{ $t("shippingPage.title") }}-->
+            </span>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div class="checkout-steps text-right">
+            <div>
+              <span class="step-number">1</span>
+              <span class="text-uppercase step-title}">{{ $t("shipping") }}</span>
+            </div>
+            <div>
+              <span class="step-number">2</span>
+              <span class="text-uppercase step-title">{{ $t("payment") }}</span>
+            </div>
+            <div>
+              <span class="step-number">3</span>
+              <span class="text-uppercase step-title">{{ $t("confirmation") }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm-12">
+          <div class="checkout">
+            <div class="row">
+              <div class="col-sm-7">
+                <!--{{> checkout/address-form addressForm=content.addressForm settings=content.addressFormSettings}}-->
+              </div>
+              <div class="col-sm-5">
+                <CheckoutCart/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import CheckoutCart from './CheckoutCart.vue';
+
+export default {
+  components: { CheckoutCart },
+};
+</script>
+
+<i18n>
+  en:
+    securePayment: "Secure payment"
+    shipping: "Shipping"
+    payment: "Payment"
+    confirmation: "Confirmation"
+  de:
+    securePayment: "Sichere Bezahlung"
+    shipping: "Versand"
+    payment: "Zahlung"
+    confirmation: "Bestätigung"
+</i18n>
diff --git a/src/components/checkout/CheckoutCart.vue b/src/components/checkout/CheckoutCart.vue
new file mode 100644
index 00000000..d6d53c7b
--- /dev/null
+++ b/src/components/checkout/CheckoutCart.vue
@@ -0,0 +1,308 @@
+<template>
+  <div v-if="me && me.activeCart">
+    <div class="order-summary">
+      <span class="text-uppercase order-summary-title">{{ $t("checkout:orderSummary") }}:</span>
+      <!--<span class="checkout-total-items">{{ $t("checkout:itemsTotal" count=content.cart.totalItems) }}</span>-->
+    </div>
+    <div class="order">
+      <VuePerfectScrollbar>
+        <div class="order-summary-items">
+          <div v-for="lineItem in sortedLineItems"
+               :key="lineItem.id"
+               class="order-summary-item">
+            <div class="row">
+              <div class="col-xs-4">
+                <div class="order-summary-img">
+                  <img :src="displayedImageUrl(lineItem.variant)"
+                       :alt="lineItem.name"
+                       class="img-responsive"/>
+                </div>
+              </div>
+              <div class="col-xs-8">
+                <div class="summary-item-info">
+                  <span class="checkout-product-name">
+                    {{ lineItem.name }}
+                  </span>
+                </div>
+                <div class="sku-code">
+                  <span>{{ lineItem.variant.sku }}</span>
+                </div>
+                <!--<div class="checkout-attributes">-->
+                  <!--<div class="checkout-attribute-field">-->
+                    <!--{{#each attributes}}-->
+                    <!--<span class="checkout-attribute">{{name}}</span>{{#unless @last}}<br>{{/unless}}-->
+                    <!--{{/each}}-->
+                  <!--</div>-->
+                  <!--<div class="checkout-attribute-field">-->
+                    <!--{{#each attributes}}-->
+                    <!--<span>{{value}}</span>{{#unless @last}}<br>{{/unless}}-->
+                    <!--{{/each}}-->
+                  <!--</div>-->
+                <!--</div>-->
+              </div>
+            </div>
+            <div class="order-item-price">
+              <div class="row">
+                <div class="col-xs-4">
+                  <div class="text-right">
+                    <span class="text-uppercase pricing-titles">{{ $t("main:common.quantity") }}</span>
+                    <br>
+                    <span>{{ lineItem.quantity }} x</span>
+                  </div>
+                </div>
+                <div class="col-xs-4">
+                  <div class="text-right order-item-value">
+                    <span class="text-uppercase pricing-titles">{{ $t("main:common.price") }}</span>
+                    <br>
+                    <BasePrice :price="lineItem.price"/>
+                  </div>
+                </div>
+                <div class="col-xs-4">
+                  <div class="text-right order-item-value">
+                    <span class="text-uppercase pricing-titles">{{ $t("checkout:total") }}</span><br>
+                    <BaseMoney :money="lineItem.totalPrice"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </VuePerfectScrollbar>
+      <CartLikePriceDetail :cart-like="me.activeCart"/>
+      <!--<div class="checkout-total-price">-->
+        <!--<div class="row">-->
+          <!--<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">-->
+            <!--<div class="text-right checkout-promo-code">-->
+              <!--<span class="text-uppercase">{{ $t("checkout:promoCodeApplied") }}</span>-->
+            <!--</div>-->
+          <!--</div>-->
+          <!--<div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">-->
+            <!--<div class="text-right checkout-promo-code">-->
+              <!--&lt;!&ndash;{{#each content.cart.discountCodes}}&ndash;&gt;-->
+              <!--&lt;!&ndash;<span class="text-uppercase">{{name}}</span><br>&ndash;&gt;-->
+              <!--&lt;!&ndash;{{/each}}&ndash;&gt;-->
+            <!--</div>-->
+          <!--</div>-->
+        <!--</div>-->
+        <!--<div class="row">-->
+          <!--<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">-->
+            <!--<div class="text-right checkout-price-text">-->
+              <!--<span>{{ $t("checkout:subtotal") }}</span><br>-->
+              <!--<span>{{ $t("checkout:shipping") }}</span>-->
+            <!--</div>-->
+          <!--</div>-->
+          <!--<div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">-->
+            <!--<div class="text-right checkout-price-digits">-->
+              <!--<span>{{content.cart.subtotalPrice}}</span><br>-->
+              <!--<span>{{content.cart.shippingMethod.price}}</span>-->
+            <!--</div>-->
+          <!--</div>-->
+        <!--</div>-->
+      <!--</div>-->
+      <!--<div class="row">-->
+        <!--<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">-->
+          <!--<div class="text-right order-tax-total-text">-->
+            <!--<span>{{ $t("main:common.salesTax") }}</span><br>-->
+            <!--<span class="total-order-value">{{ $t("checkout:total") }}</span>-->
+          <!--</div>-->
+        <!--</div>-->
+        <!--<div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">-->
+          <!--<div class="text-right order-tax-total-digits">-->
+            <!--<span>{{content.cart.salesTax}}</span><br>-->
+            <!--<span class="total-order-value">{{content.cart.totalPrice}}</span>-->
+          <!--</div>-->
+        <!--</div>-->
+      <!--</div>-->
+      <!--<div class="row">-->
+        <!--<div class="col-sm-12">-->
+          <!--<div>-->
+          <!--<span class="text-uppercase pull-right edit-quantity-order">-->
+              <!--&lt;!&ndash;<a href="{{@root.meta._links.cart.href}}">
+              {{ $t("checkout:editMyCart") }}</a>&ndash;&gt;-->
+          <!--</span>-->
+          <!--</div>-->
+        <!--</div>-->
+      <!--</div>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import gql from 'graphql-tag';
+import VuePerfectScrollbar from 'vue-perfect-scrollbar';
+import BasePrice from '../common/BasePrice.vue';
+import BaseMoney from '../common/BaseMoney.vue';
+import productMixin from '@/mixins/productMixin';
+import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
+import CartLikePriceDetail from '../common/CartLikePriceDetail.vue';
+
+export default {
+  components: {
+    CartLikePriceDetail,
+    BasePrice,
+    BaseMoney,
+    VuePerfectScrollbar,
+  },
+
+  mixins: [productMixin],
+
+  data: () => ({
+    me: null,
+  }),
+
+  computed: {
+    sortedLineItems() {
+      if (this.me && this.me.activeCart) {
+        const { lineItems } = this.me.activeCart;
+        return lineItems.reverse();
+      }
+      return [];
+    },
+  },
+
+  apollo: {
+    me: {
+      query: gql`
+        query me($locale: Locale!) {
+          me {
+            activeCart {
+              id
+              version
+              lineItems {
+                id
+                quantity
+                name(locale: $locale)
+                productSlug(locale: $locale)
+                variant {
+                  sku
+                  images {
+                    url
+                  }
+                }
+                totalPrice {
+                  ...DisplayableMoney
+                }
+              }
+              totalPrice {
+                ...DisplayableMoney
+              }
+            }
+          }
+        }
+        ${DisplayableMoneyFragment}`,
+      variables() {
+        return {
+          locale: this.$i18n.locale,
+        };
+      },
+    },
+  },
+};
+</script>
+
+<!-- eslint-disable max-len -->
+<i18n>
+  en:
+    addToNewsletter: "Please add me to the"
+    agreeToTermsHtml: "I agree to the Terms and Conditions"
+    billingAddress: "Billing Address"
+    completeMyOrder: "Complete My Order"
+    continueCheckout: "Continue Checkout"
+    continueShopping: "Continue Shopping"
+    discountApply: "apply"
+    discountTooltip: "Discount options additional information..."
+    discountPromoInfo: "PROMOTIONAL DISCOUNT INFO"
+    editMyCart: "Edit my shopping cart"
+    itemsTotal: "__count__ item in total"
+    itemsTotal_plural: "__count__ items in total"
+    needHelpCustomerService: "Need help? Customer Service"
+    orderDate: "Order Date"
+    orderDiscount: "Order Discount"
+    orderNumber: "Order Number"
+    orderSummary: "Order Summary"
+    paymentInformation: "Payment Details"
+    promoCodeApplied: "Promotional Code Applied"
+    returningCustomer: "Returning Customer"
+    rememberMe: "Save my details to create my personal account at SUNRISE"
+    shippingAddress: "Shipping Address"
+    shippingInformation: "Shipping Information"
+    shippingMethod: "Shipping Method"
+    subtotal: "Subtotal"
+    total: "Total"
+    yourBag: "Your Bag"
+    cartDetailPage:
+      title: "Your Cart"
+    signInPage:
+      title: "Secure Checkout - Sign In"
+    shippingPage:
+      title: "Secure Checkout - Shipping"
+      differentBillingAddressCheckboxLabel: "Use a different address for billing"
+      emailInfo: "We require your email address to send your shipping and order confirmation"
+      telNumberInfo: "Please provide your telephone number so the shipper can contact you during delivery"
+    paymentPage:
+      title: "Secure Checkout - Payment"
+      cardName: "Name on credit card"
+      cardNumber: "Credit card number"
+      expiryDateTitle: "Expiry data"
+      paymentOptionsTitle: "Please provide one of the following payment options"
+      securityCode: "Security Code"
+      securityCodeTooltip: "normally you find it on the back of your card"
+    confirmationPage:
+      title: "Secure Checkout - Confirmation"
+    thankYouPage:
+      title: "Thank you for your order!"
+      emailSentToStart: "An email has been sent to"
+      emailSentToEnd: "as a copy of this confirmation purchase"
+      yourOrderDetails: "Your order details"
+  de:
+    addToNewsletter: "Bitte senden Sie mir den"
+    agreeToTermsHtml: "Ich stimme den AGB zu"
+    billingAddress: "Zahlungsadresse"
+    completeMyOrder: "Zahlungspflichtig bestellen"
+    continueCheckout: "Weiter"
+    continueShopping: "Weiter einkaufen"
+    discountApply: "Anwenden"
+    discountTooltip: "Weitere Rabatt Informationen..."
+    discountPromoInfo: "Rabatte"
+    editMyCart: "Warenkorb bearbeiten"
+    itemsTotal: "__count__ Artikel im Warenkorb"
+    needHelpCustomerService: "Brauchen Sie Hilfe? Kundenservice"
+    orderDate: "Bestelldatum"
+    orderDiscount: "Bestelldiscount"
+    orderNumber: "Bestellnummer"
+    orderSummary: "Bestellübersicht"
+    paymentInformation: "Zahlungsdetails"
+    promoCodeApplied: "Gutschein eingelöst"
+    returningCustomer: "Wiederkehrender Besucher"
+    rememberMe: "Meine Daten speichern für einen Account"
+    shippingAddress: "Versandadresse"
+    shippingInformation: "Versand Information"
+    shippingMethod: "Versandart"
+    subtotal: "Zwischensumme"
+    total: "Gesamtpreis"
+    yourBag: "Ihr Einkaufswagen"
+    cartDetailPage:
+      title: "Ihr Einkaufswagen"
+    signInPage:
+      title: "Sicherer Bestellprozess - Anmeldung"
+    shippingPage:
+      title: "Sicherer Bestellprozess - Versand"
+      differentBillingAddressCheckboxLabel: "Abweichende Adresse als Rechnungsadresse verwenden."
+      emailInfo: "Bitte geben Sie Ihre E-Mail-Adresse an, damit wir Sie über den Status und Versand Ihrer Bestellung informieren können."
+      telNumberInfo: "Bitte geben Sie Ihre Telefonnummer an, damit unser Lieferant Sie über den Liefertermin informieren kann."
+    paymentPage:
+      title: "Sicherer Bestellprozess - Bezahlung"
+      cardName: "Name auf der Kreditkarte"
+      cardNumber: "Kreditkartennummer"
+      expiryDateTitle: "Gültig bis"
+      paymentOptionsTitle: "Bitte wählen Sie eine Zahlungsart aus"
+      securityCode: "Prüfnummer"
+      securityCodeTooltip: "Normalerweise befindet sich der Code auf der Rückseite."
+    confirmationPage:
+      title: "Sicherer Bestellprozess - Versand"
+    thankYouPage:
+      title: "Vielen Dank für Ihre Bestellung!"
+      emailSentToStart: "Eine Email wurde versandt"
+      emailSentToEnd: "als Bestellbestätigung."
+      yourOrderDetails: "Ihre Bestelldetails"
+</i18n>
diff --git a/src/router.js b/src/router.js
index e67ff009..1f1d0696 100644
--- a/src/router.js
+++ b/src/router.js
@@ -9,6 +9,7 @@ import PageUserAccount from '@/components/useraccount/PageUserAccount.vue';
 import PageNotFound from '@/components/common/PageNotFound.vue';
 import PageProductDetail from '@/components/productdetail/PageProductDetail.vue';
 import PageCartDetail from '@/components/cartdetail/PageCartDetail.vue';
+import CheckoutAddress from '@/components/checkout/CheckoutAddress.vue';
 
 Vue.use(Router);
 
@@ -119,6 +120,14 @@ const router = new Router({
         header: TheHeader,
       },
     },
+    {
+      path: '/checkout',
+      name: 'checkout',
+      components: {
+        default: CheckoutAddress,
+        header: TheHeader,
+      },
+    },
   ],
 });
 
diff --git a/templates/partials/checkout/checkout-item.hbs b/templates/partials/checkout/checkout-item.hbs
deleted file mode 100644
index f8b93ffc..00000000
--- a/templates/partials/checkout/checkout-item.hbs
+++ /dev/null
@@ -1,112 +0,0 @@
-<div class="order">
-  <div class="order-summary-items">
-    {{#each content.cart.lineItems.list}}
-      <div class="order-summary-item">
-        <div class="row">
-          <div class="col-xs-4">
-            <div class="order-summary-img">
-              <img class="img-responsive" src="{{variant.image}}" alt="{{variant.name}}">
-            </div>
-          </div>
-          <div class="col-xs-8">
-            <div class="summary-item-info">
-              <span class="checkout-product-name">{{variant.name}}</span>
-            </div>
-            <div class="sku-code">
-              <span>{{variant.sku}}</span>
-            </div>
-            <div class="checkout-attributes">
-                <div class="checkout-attribute-field">
-                {{#each attributes}}
-                    <span class="checkout-attribute">{{name}}</span>{{#unless @last}}<br>{{/unless}}
-                {{/each}}
-                </div>
-                <div class="checkout-attribute-field">
-                {{#each attributes}}
-                    <span>{{value}}</span>{{#unless @last}}<br>{{/unless}}
-                {{/each}}
-                </div>
-            </div>
-          </div>
-        </div>
-        <div class="order-item-price">
-          <div class="row">
-            <div class="col-xs-4">
-              <div class="text-right">
-                <span class="text-uppercase pricing-titles">{{i18n "main:common.quantity"}}</span><br>
-                <span>{{quantity}} x</span>
-              </div>
-            </div>
-            <div class="col-xs-4">
-              <div class="text-right order-item-value">
-                <span class="text-uppercase pricing-titles">{{i18n "main:common.price"}}</span><br>
-                {{#if variant.priceOld}}<span class="checkout-discounted-price">{{variant.priceOld}}</span><br>{{/if}}
-                <span>{{variant.price}}</span>
-              </div>
-            </div>
-            <div class="col-xs-4">
-              <div class="text-right order-item-value">
-                <span class="text-uppercase pricing-titles">{{i18n "checkout:total"}}</span><br>
-                <span>{{totalPrice}}</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    {{/each}}
-  </div>
-  <div class="checkout-total-price">
-    <div class="row">
-      <div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">
-        <div class="text-right checkout-promo-code">
-          <span class="text-uppercase">{{i18n "checkout:promoCodeApplied"}}</span>
-        </div>
-      </div>
-      <div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">
-        <div class="text-right checkout-promo-code">
-          {{#each content.cart.discountCodes}}
-          <span class="text-uppercase">{{name}}</span><br>
-          {{/each}}
-        </div>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">
-        <div class="text-right checkout-price-text">
-          <span>{{i18n "checkout:subtotal"}}</span><br>
-          <span>{{i18n "checkout:shipping"}}</span>
-        </div>
-      </div>
-      <div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">
-        <div class="text-right checkout-price-digits">
-          <span>{{content.cart.subtotalPrice}}</span><br>
-          <span>{{content.cart.shippingMethod.price}}</span>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">
-      <div class="text-right order-tax-total-text">
-        <span>{{i18n "main:common.salesTax"}}</span><br>
-        <span class="total-order-value">{{i18n "checkout:total"}}</span>
-      </div>
-    </div>
-    <div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">
-      <div class="text-right order-tax-total-digits">
-        <span>{{content.cart.salesTax}}</span><br>
-        <span class="total-order-value">{{content.cart.totalPrice}}</span>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-sm-12">
-      <div>
-        <span class="text-uppercase pull-right edit-quantity-order">
-            <a href="{{@root.meta._links.cart.href}}">{{i18n "checkout:editMyCart"}}</a>
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/templates/partials/checkout/order-summary-sidebar.hbs b/templates/partials/checkout/order-summary-sidebar.hbs
deleted file mode 100644
index 7af8a397..00000000
--- a/templates/partials/checkout/order-summary-sidebar.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="order-summary">
-    <span class="text-uppercase order-summary-title">{{i18n "checkout:orderSummary"}}:</span>
-    <span class="checkout-total-items">{{i18n "checkout:itemsTotal" count=content.cart.totalItems}}</span>
-</div>
-{{> checkout/checkout-item}}
diff --git a/templates/partials/checkout/secure-checkout-title.hbs b/templates/partials/checkout/secure-checkout-title.hbs
deleted file mode 100644
index 58d50379..00000000
--- a/templates/partials/checkout/secure-checkout-title.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="secure-payment">
-    <span><img class="secure-payment-icon" src="{{@root.meta.assetsPath}}img/credit-card-lock.png" alt="secure payment"></span>
-    <span class="text-uppercase secure-payment-title">{{i18n titleKey}}</span>
-</div>
diff --git a/templates/partials/checkout/step-widget.hbs b/templates/partials/checkout/step-widget.hbs
deleted file mode 100644
index a3abad72..00000000
--- a/templates/partials/checkout/step-widget.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="checkout-steps text-right">
-    <div>
-        <span class="step-number{{#if content.stepWidget.shippingStepActive}} step-number-active{{/if}}">1</span>
-        <span class="text-uppercase step-title{{#if content.stepWidget.shippingStepActive}} step-title-active{{/if}}">{{i18n "checkout:shipping"}}</span>
-    </div>
-    <div>
-        <span class="step-number{{#if content.stepWidget.paymentStepActive}} step-number-active{{/if}}">2</span>
-        <span class="text-uppercase step-title{{#if content.stepWidget.paymentStepActive}} step-title-active{{/if}}">{{i18n "checkout:payment"}}</span>
-    </div>
-    <div>
-        <span class="step-number{{#if content.stepWidget.confirmationStepActive}} step-number-active{{/if}}">3</span>
-        <span class="text-uppercase step-title{{#if content.stepWidget.confirmationStepActive}} step-title-active{{/if}}">{{i18n "checkout:confirmation"}}</span>
-    </div>
-</div>

From 0afc5009dd8cb9c9213f1578104ae5809ad24af0 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 8 Apr 2019 14:43:37 +0200
Subject: [PATCH 03/69] Improve namings and flat structure from previous
 refactoring

---
 src/assets/scss/_cart.scss                     |  5 ++---
 .../cartdetail/LineItemDeleteForm.vue          |  3 ++-
 src/components/cartdetail/PageCartDetail.vue   | 15 +++++----------
 src/components/common/CartLikeSummary.vue      | 18 ++++++++++--------
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/assets/scss/_cart.scss b/src/assets/scss/_cart.scss
index b5d419e1..8d2aa21d 100755
--- a/src/assets/scss/_cart.scss
+++ b/src/assets/scss/_cart.scss
@@ -108,16 +108,15 @@
   -khtml-user-select: none;
   -ms-user-select: none;
 }
-.edit-delete-section {
+.cart-edit-delete.edit-delete-section {
   padding: 0.5em 0;
   font-size: 12px;
 
   // Inline contextual rules
   @media screen and (min-width: 999px) {
-    width: 100%;
     text-align: center;
   }
-  button {
+  .delete-text {
     text-transform: uppercase;
   }
 }
diff --git a/src/components/cartdetail/LineItemDeleteForm.vue b/src/components/cartdetail/LineItemDeleteForm.vue
index 4f07b1c8..e83ab349 100644
--- a/src/components/cartdetail/LineItemDeleteForm.vue
+++ b/src/components/cartdetail/LineItemDeleteForm.vue
@@ -1,6 +1,7 @@
 <template>
   <button @click="submit"
-          data-test="cart-line-item-delete">
+          data-test="cart-line-item-delete"
+          class="edit-delete-section">
     <img src="../../assets/img/delete-1.png"
          class="cart-action-icon"
          :alt="$t('delete')">
diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index f80a4281..48f45f87 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -22,18 +22,13 @@
         <div class="col-sm-12">
           <div class="cart-content">
             <CartLikeSummary :cart-like="me.activeCart">
-              <template #editable="{ lineItem }">
-                <div>
-                  <div class="col-sm-2 col-xs-12 cart-edit-delete">
-                    <div class="edit-delete-section">
-                      <LineItemDeleteForm :line-item="lineItem"
-                                          @submit="removeLineItem"/>
-                    </div>
-                  </div>
-                </div>
+              <template #quantity-column="{ lineItem }">
+                <LineItemDeleteForm :line-item="lineItem"
+                                    @submit="removeLineItem"
+                                    class="col-sm-6 col-xs-12 cart-edit-delete"/>
                 <LineItemQuantityForm :line-item="lineItem"
                                       @submit="changeLineItemQuantity"
-                                      class="col-sm-2 col-xs-12 clearfix sm-pull-right"/>
+                                      class="col-sm-6 col-xs-12 clearfix sm-pull-right"/>
               </template>
             </CartLikeSummary>
           </div>
diff --git a/src/components/common/CartLikeSummary.vue b/src/components/common/CartLikeSummary.vue
index ba94603b..49aa263e 100644
--- a/src/components/common/CartLikeSummary.vue
+++ b/src/components/common/CartLikeSummary.vue
@@ -22,16 +22,18 @@
          class="row single-cart-item">
       <LineItemInfo :line-item="lineItem"
                     class="col-sm-4 col-xs-12"/>
-      <slot name="editable"
-            :lineItem="lineItem">
-        <div class="col-sm-2 col-sm-offset-2 col-xs-12 text-center quantity-counter">
-          <span class="visible-xs">{{ $t('quantity') }}:</span>
-          <span data-test="cart-line-item-quantity"
-                class="quantity-number">
+      <div class="col-sm-4 col-xs-12">
+        <slot name="quantity-column"
+              :lineItem="lineItem">
+          <div class="col-sm-6 col-sm-offset-6 col-xs-12 text-center quantity-counter">
+            <span class="visible-xs">{{ $t('quantity') }}:</span>
+            <span data-test="cart-line-item-quantity"
+                  class="quantity-number">
                 {{ lineItem.quantity }}
               </span>
-        </div>
-      </slot>
+          </div>
+        </slot>
+      </div>
       <div>
         <div class="col-sm-2 col-xs-12 sm-pull-right">
           <div class="text-right cart-item-price">

From 8b29d24f28ccbd3ea487acafccd92441b656da42 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 9 Apr 2019 15:54:14 +0200
Subject: [PATCH 04/69] Finish checkout cart summary

---
 src/assets/scss/_checkout-shipping.scss       |  30 +--
 src/assets/scss/_navigation.scss              |   1 -
 .../cartdetail/LineItemDeleteForm.vue         |   7 +
 src/components/cartdetail/PageCartDetail.vue  |  16 +-
 src/components/checkout/CheckoutAddress.vue   |   4 +-
 src/components/checkout/CheckoutCart.vue      | 198 ++++++------------
 src/components/common/CartLikePriceDetail.vue | 128 +++++------
 src/components/common/CartLikeSummary.vue     |  21 +-
 src/components/header/MiniCart.vue            |   8 -
 src/mixins/cartMixin.js                       |   7 +
 .../partials/checkout/start-checkout-link.hbs |   3 -
 11 files changed, 185 insertions(+), 238 deletions(-)
 delete mode 100644 templates/partials/checkout/start-checkout-link.hbs

diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
index 41863c37..b9fee8dd 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -177,16 +177,21 @@
   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: 0.5em;
+    img {
+      border: 1px solid $alto;
+    }
   }
 }
 .summary-item-info {
@@ -233,11 +238,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;
@@ -257,7 +263,7 @@
   font-size: 0.9em;
   color: $gray;
   text-decoration: underline;
-  margin: 1em;
+  margin-top: 1em;
   letter-spacing: 0.05em;
 }
 .total-order-value {
diff --git a/src/assets/scss/_navigation.scss b/src/assets/scss/_navigation.scss
index c7b6593d..09cee335 100755
--- a/src/assets/scss/_navigation.scss
+++ b/src/assets/scss/_navigation.scss
@@ -519,7 +519,6 @@
 
         p {
           margin: 0;
-          font-size: 1.2em;
           text-align: right;
           padding-right: 15px;
           margin-right: 15px;
diff --git a/src/components/cartdetail/LineItemDeleteForm.vue b/src/components/cartdetail/LineItemDeleteForm.vue
index e83ab349..a0ea3e08 100644
--- a/src/components/cartdetail/LineItemDeleteForm.vue
+++ b/src/components/cartdetail/LineItemDeleteForm.vue
@@ -25,3 +25,10 @@ export default {
   },
 };
 </script>
+
+<i18n>
+en:
+  delete: "Delete"
+de:
+  delete: "Löschen"
+</i18n>
diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index 48f45f87..11bd3e73 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="cart-page container">
+  <div v-if="me"
+       class="cart-page container">
     <div class="row">
       <div class="col-sm-8 col-xs-12">
         <div class="current-in-bag">
@@ -25,10 +26,10 @@
               <template #quantity-column="{ lineItem }">
                 <LineItemDeleteForm :line-item="lineItem"
                                     @submit="removeLineItem"
-                                    class="col-sm-6 col-xs-12 cart-edit-delete"/>
+                                    class="col-sm-5 cart-edit-delete"/>
                 <LineItemQuantityForm :line-item="lineItem"
                                       @submit="changeLineItemQuantity"
-                                      class="col-sm-6 col-xs-12 clearfix sm-pull-right"/>
+                                      class="col-sm-7 clearfix sm-pull-right"/>
               </template>
             </CartLikeSummary>
           </div>
@@ -42,7 +43,12 @@
           </router-link>
         </div>
         <div class="col-sm-6">
-          <!--{{> checkout/start-checkout-link bottom=true}}-->
+          <div class="checkout-now checkout-now-bottom">
+            <router-link :to="{ name: 'checkout'}"
+                         class="pull-right text-uppercase checkout-now-btn">
+              {{ $t('startCheckout') }}
+            </router-link>
+          </div>
         </div>
       </div>
     </div>
@@ -171,9 +177,11 @@ en:
   itemsTotal: "{n} item in total | {n} items in total"
   empty: "Your bag is empty"
   continueShopping: "Continue Shopping"
+  startCheckout: "Start Checkout"
 de:
   yourBag: "Ihr Einkaufswagen"
   itemsTotal: "{n} Artikel im Warenkorb"
   empty: "Ihr Einkaufswagen ist leer :("
   continueShopping: "Weiter einkaufen"
+  startCheckout: "Zur Kasse"
 </i18n>
diff --git a/src/components/checkout/CheckoutAddress.vue b/src/components/checkout/CheckoutAddress.vue
index f4842335..b2b8ea98 100644
--- a/src/components/checkout/CheckoutAddress.vue
+++ b/src/components/checkout/CheckoutAddress.vue
@@ -53,7 +53,9 @@
 import CheckoutCart from './CheckoutCart.vue';
 
 export default {
-  components: { CheckoutCart },
+  components: {
+    CheckoutCart,
+  },
 };
 </script>
 
diff --git a/src/components/checkout/CheckoutCart.vue b/src/components/checkout/CheckoutCart.vue
index d6d53c7b..9e672cc0 100644
--- a/src/components/checkout/CheckoutCart.vue
+++ b/src/components/checkout/CheckoutCart.vue
@@ -1,65 +1,39 @@
 <template>
   <div v-if="me && me.activeCart">
     <div class="order-summary">
-      <span class="text-uppercase order-summary-title">{{ $t("checkout:orderSummary") }}:</span>
-      <!--<span class="checkout-total-items">{{ $t("checkout:itemsTotal" count=content.cart.totalItems) }}</span>-->
+      <span class="text-uppercase order-summary-title">{{ $t("orderSummary") }}:</span>
+      <span class="checkout-total-items">
+        {{ $tc('itemsTotal', totalItems) }}
+      </span>
     </div>
-    <div class="order">
+    <div class="checkout-order">
       <VuePerfectScrollbar>
         <div class="order-summary-items">
           <div v-for="lineItem in sortedLineItems"
                :key="lineItem.id"
                class="order-summary-item">
-            <div class="row">
-              <div class="col-xs-4">
-                <div class="order-summary-img">
-                  <img :src="displayedImageUrl(lineItem.variant)"
-                       :alt="lineItem.name"
-                       class="img-responsive"/>
-                </div>
-              </div>
-              <div class="col-xs-8">
-                <div class="summary-item-info">
-                  <span class="checkout-product-name">
-                    {{ lineItem.name }}
-                  </span>
-                </div>
-                <div class="sku-code">
-                  <span>{{ lineItem.variant.sku }}</span>
-                </div>
-                <!--<div class="checkout-attributes">-->
-                  <!--<div class="checkout-attribute-field">-->
-                    <!--{{#each attributes}}-->
-                    <!--<span class="checkout-attribute">{{name}}</span>{{#unless @last}}<br>{{/unless}}-->
-                    <!--{{/each}}-->
-                  <!--</div>-->
-                  <!--<div class="checkout-attribute-field">-->
-                    <!--{{#each attributes}}-->
-                    <!--<span>{{value}}</span>{{#unless @last}}<br>{{/unless}}-->
-                    <!--{{/each}}-->
-                  <!--</div>-->
-                <!--</div>-->
-              </div>
-            </div>
+            <LineItemInfo :line-item="lineItem"
+                          class="col-sm-12"/>
             <div class="order-item-price">
               <div class="row">
                 <div class="col-xs-4">
                   <div class="text-right">
-                    <span class="text-uppercase pricing-titles">{{ $t("main:common.quantity") }}</span>
+                    <span class="text-uppercase pricing-titles">{{ $t("quantity") }}</span>
                     <br>
-                    <span>{{ lineItem.quantity }} x</span>
+                    <span>{{ lineItem.quantity }}</span>
                   </div>
                 </div>
                 <div class="col-xs-4">
                   <div class="text-right order-item-value">
-                    <span class="text-uppercase pricing-titles">{{ $t("main:common.price") }}</span>
+                    <span class="text-uppercase pricing-titles">{{ $t("price") }}</span>
                     <br>
                     <BasePrice :price="lineItem.price"/>
                   </div>
                 </div>
                 <div class="col-xs-4">
                   <div class="text-right order-item-value">
-                    <span class="text-uppercase pricing-titles">{{ $t("checkout:total") }}</span><br>
+                    <span class="text-uppercase pricing-titles">{{ $t("total") }}</span>
+                    <br>
                     <BaseMoney :money="lineItem.totalPrice"/>
                   </div>
                 </div>
@@ -69,60 +43,11 @@
         </div>
       </VuePerfectScrollbar>
       <CartLikePriceDetail :cart-like="me.activeCart"/>
-      <!--<div class="checkout-total-price">-->
-        <!--<div class="row">-->
-          <!--<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">-->
-            <!--<div class="text-right checkout-promo-code">-->
-              <!--<span class="text-uppercase">{{ $t("checkout:promoCodeApplied") }}</span>-->
-            <!--</div>-->
-          <!--</div>-->
-          <!--<div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">-->
-            <!--<div class="text-right checkout-promo-code">-->
-              <!--&lt;!&ndash;{{#each content.cart.discountCodes}}&ndash;&gt;-->
-              <!--&lt;!&ndash;<span class="text-uppercase">{{name}}</span><br>&ndash;&gt;-->
-              <!--&lt;!&ndash;{{/each}}&ndash;&gt;-->
-            <!--</div>-->
-          <!--</div>-->
-        <!--</div>-->
-        <!--<div class="row">-->
-          <!--<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">-->
-            <!--<div class="text-right checkout-price-text">-->
-              <!--<span>{{ $t("checkout:subtotal") }}</span><br>-->
-              <!--<span>{{ $t("checkout:shipping") }}</span>-->
-            <!--</div>-->
-          <!--</div>-->
-          <!--<div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">-->
-            <!--<div class="text-right checkout-price-digits">-->
-              <!--<span>{{content.cart.subtotalPrice}}</span><br>-->
-              <!--<span>{{content.cart.shippingMethod.price}}</span>-->
-            <!--</div>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
-      <!--<div class="row">-->
-        <!--<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">-->
-          <!--<div class="text-right order-tax-total-text">-->
-            <!--<span>{{ $t("main:common.salesTax") }}</span><br>-->
-            <!--<span class="total-order-value">{{ $t("checkout:total") }}</span>-->
-          <!--</div>-->
-        <!--</div>-->
-        <!--<div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">-->
-          <!--<div class="text-right order-tax-total-digits">-->
-            <!--<span>{{content.cart.salesTax}}</span><br>-->
-            <!--<span class="total-order-value">{{content.cart.totalPrice}}</span>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
-      <!--<div class="row">-->
-        <!--<div class="col-sm-12">-->
-          <!--<div>-->
-          <!--<span class="text-uppercase pull-right edit-quantity-order">-->
-              <!--&lt;!&ndash;<a href="{{@root.meta._links.cart.href}}">
-              {{ $t("checkout:editMyCart") }}</a>&ndash;&gt;-->
-          <!--</span>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
+      <div class="row">
+        <span class="text-uppercase pull-right edit-quantity-order">
+          <router-link :to="{ name: 'cart' }">{{ $t("editMyCart") }}</router-link>
+        </span>
+      </div>
     </div>
   </div>
 </template>
@@ -132,34 +57,27 @@ import gql from 'graphql-tag';
 import VuePerfectScrollbar from 'vue-perfect-scrollbar';
 import BasePrice from '../common/BasePrice.vue';
 import BaseMoney from '../common/BaseMoney.vue';
-import productMixin from '@/mixins/productMixin';
+import productMixin from '../../mixins/productMixin';
+import cartMixin from '../../mixins/cartMixin';
 import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
 import CartLikePriceDetail from '../common/CartLikePriceDetail.vue';
+import LineItemInfo from '../common/LineItemInfo.vue';
 
 export default {
   components: {
+    LineItemInfo,
     CartLikePriceDetail,
     BasePrice,
     BaseMoney,
     VuePerfectScrollbar,
   },
 
-  mixins: [productMixin],
+  mixins: [productMixin, cartMixin],
 
   data: () => ({
     me: null,
   }),
 
-  computed: {
-    sortedLineItems() {
-      if (this.me && this.me.activeCart) {
-        const { lineItems } = this.me.activeCart;
-        return lineItems.reverse();
-      }
-      return [];
-    },
-  },
-
   apollo: {
     me: {
       query: gql`
@@ -179,6 +97,16 @@ export default {
                     url
                   }
                 }
+                price {
+                  value {
+                    ...DisplayableMoney
+                  }
+                  discounted {
+                    value {
+                      ...DisplayableMoney
+                    }
+                  }
+                }
                 totalPrice {
                   ...DisplayableMoney
                 }
@@ -186,6 +114,19 @@ export default {
               totalPrice {
                 ...DisplayableMoney
               }
+              shippingInfo {
+                price {
+                  ...DisplayableMoney
+                }
+              }
+              taxedPrice {
+                totalGross {
+                  ...DisplayableMoney
+                }
+                totalNet {
+                  ...DisplayableMoney
+                }
+              }
             }
           }
         }
@@ -203,37 +144,26 @@ export default {
 <!-- eslint-disable max-len -->
 <i18n>
   en:
-    addToNewsletter: "Please add me to the"
-    agreeToTermsHtml: "I agree to the Terms and Conditions"
+    itemsTotal: "{n} item in total | {n} items in total"
+    editMyCart: "Edit my shopping cart"
+    orderSummary: "Order Summary"
+    quantity: "Quantity"
+    price: "Price"
+    total: "Total"
+
     billingAddress: "Billing Address"
     completeMyOrder: "Complete My Order"
     continueCheckout: "Continue Checkout"
-    continueShopping: "Continue Shopping"
-    discountApply: "apply"
-    discountTooltip: "Discount options additional information..."
-    discountPromoInfo: "PROMOTIONAL DISCOUNT INFO"
-    editMyCart: "Edit my shopping cart"
-    itemsTotal: "__count__ item in total"
-    itemsTotal_plural: "__count__ items in total"
     needHelpCustomerService: "Need help? Customer Service"
     orderDate: "Order Date"
     orderDiscount: "Order Discount"
     orderNumber: "Order Number"
-    orderSummary: "Order Summary"
     paymentInformation: "Payment Details"
     promoCodeApplied: "Promotional Code Applied"
-    returningCustomer: "Returning Customer"
     rememberMe: "Save my details to create my personal account at SUNRISE"
     shippingAddress: "Shipping Address"
     shippingInformation: "Shipping Information"
     shippingMethod: "Shipping Method"
-    subtotal: "Subtotal"
-    total: "Total"
-    yourBag: "Your Bag"
-    cartDetailPage:
-      title: "Your Cart"
-    signInPage:
-      title: "Secure Checkout - Sign In"
     shippingPage:
       title: "Secure Checkout - Shipping"
       differentBillingAddressCheckboxLabel: "Use a different address for billing"
@@ -255,36 +185,26 @@ export default {
       emailSentToEnd: "as a copy of this confirmation purchase"
       yourOrderDetails: "Your order details"
   de:
-    addToNewsletter: "Bitte senden Sie mir den"
-    agreeToTermsHtml: "Ich stimme den AGB zu"
+    itemsTotal: "{n} Artikel im Warenkorb"
+    editMyCart: "Warenkorb bearbeiten"
+    orderSummary: "Bestellübersicht"
+    quantity: "Menge"
+    price: "Preis"
+    total: "Gesamtpreis"
+
     billingAddress: "Zahlungsadresse"
     completeMyOrder: "Zahlungspflichtig bestellen"
     continueCheckout: "Weiter"
-    continueShopping: "Weiter einkaufen"
-    discountApply: "Anwenden"
-    discountTooltip: "Weitere Rabatt Informationen..."
-    discountPromoInfo: "Rabatte"
-    editMyCart: "Warenkorb bearbeiten"
-    itemsTotal: "__count__ Artikel im Warenkorb"
     needHelpCustomerService: "Brauchen Sie Hilfe? Kundenservice"
     orderDate: "Bestelldatum"
     orderDiscount: "Bestelldiscount"
     orderNumber: "Bestellnummer"
-    orderSummary: "Bestellübersicht"
     paymentInformation: "Zahlungsdetails"
     promoCodeApplied: "Gutschein eingelöst"
-    returningCustomer: "Wiederkehrender Besucher"
     rememberMe: "Meine Daten speichern für einen Account"
     shippingAddress: "Versandadresse"
     shippingInformation: "Versand Information"
     shippingMethod: "Versandart"
-    subtotal: "Zwischensumme"
-    total: "Gesamtpreis"
-    yourBag: "Ihr Einkaufswagen"
-    cartDetailPage:
-      title: "Ihr Einkaufswagen"
-    signInPage:
-      title: "Sicherer Bestellprozess - Anmeldung"
     shippingPage:
       title: "Sicherer Bestellprozess - Versand"
       differentBillingAddressCheckboxLabel: "Abweichende Adresse als Rechnungsadresse verwenden."
diff --git a/src/components/common/CartLikePriceDetail.vue b/src/components/common/CartLikePriceDetail.vue
index 9ebc7373..49812dd5 100644
--- a/src/components/common/CartLikePriceDetail.vue
+++ b/src/components/common/CartLikePriceDetail.vue
@@ -1,65 +1,75 @@
 <template>
-  <div v-if="cartLike">
+  <div v-if="cartLike"
+       class="cart-like-price-detail">
     <div class="row">
-      <div class="col-sm-12">
-          <div class="row">
-            <div class="col-sm-10 col-xs-7">
-              <div class="text-right subtotal">
-                <span class="subtotal-title">{{ $t('subtotal') }}</span>
-              </div>
-              <div class="text-right">
-                <!--<span class="order-discount">{{ $t('checkout.orderDiscount') }}</span>-->
-              </div>
-              <div v-if="cartLike.shippingInfo"
-                   class="text-right delivery-info">
-                <span class="delivery-info-title">{{ $t('shipping') }}</span>
-              </div>
-              <hr class="total-divider">
-              <div v-if="taxes"
-                   class="text-right">
-                <span>{{ $t('salesTax') }}</span>
-              </div>
-              <div class="text-right">
-                <span class="order-total">{{ $t('total') }}</span>
-              </div>
-            </div>
-            <div class="col-sm-2 col-xs-5 text-right">
-              <div>
-                <span data-test="cart-subtotal-price">
-                  <BaseMoney :money="subtotal"/>
-                </span>
-              </div>
-              <div>
-                <!--<span class="order-discount">{{ cart.discount }}</span>-->
-              </div>
-              <div>
-                <span v-if="cartLike.shippingInfo">
-                  <BaseMoney :money="cartLike.shippingInfo.price"/>
-                </span>
-              </div>
-              <hr>
-              <div>
-                <span v-if="taxes">
-                  <BaseMoney :money="taxes"/>
-                </span>
-              </div>
-              <div>
-                <span data-test="cart-total-price"
-                      class="order-total">
-                  <BaseMoney :money="cartLike.totalPrice"/>
-                </span>
-              </div>
-            </div>
-
-            <!--{{#if checkoutConfirmation}}-->
-            <!--<div class="complete-order">-->
-              <!--<button id="confirmation-completeorder-btn"-->
-                      <!--class="btn complete-order-btn">{{ $t('checkout.completeMyOrder') }}</button>-->
-              <!--<br>-->
-            <!--</div>-->
-            <!--{{/if}}-->
-          </div>
+      <div class="col-sm-7 col-xs-7">
+        <div class="text-right subtotal">
+          <span class="subtotal-title">{{ $t('subtotal') }}</span>
+        </div>
+        <div class="text-right">
+          <!--<div class="row">-->
+          <!--<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">-->
+          <!--<div class="text-right checkout-promo-code">-->
+          <!--<span class="text-uppercase">{{ $t("checkout:promoCodeApplied") }}</span>-->
+          <!--</div>-->
+          <!--</div>-->
+          <!--<div class="col-lg-4 col-md-5 col-sm-5 col-xs-5">-->
+          <!--<div class="text-right checkout-promo-code">-->
+          <!--&lt;!&ndash;{{#each content.cart.discountCodes}}&ndash;&gt;-->
+          <!--&lt;!&ndash;<span class="text-uppercase">{{name}}</span><br>&ndash;&gt;-->
+          <!--&lt;!&ndash;{{/each}}&ndash;&gt;-->
+          <!--</div>-->
+          <!--</div>-->
+          <!--</div>-->
+        </div>
+        <div v-if="cartLike.shippingInfo"
+             class="text-right delivery-info">
+          <span class="delivery-info-title">{{ $t('shipping') }}</span>
+        </div>
+        <hr class="total-divider">
+        <div v-if="taxes"
+             class="text-right">
+          <span>{{ $t('salesTax') }}</span>
+        </div>
+        <div class="text-right">
+          <span class="order-total">{{ $t('total') }}</span>
+        </div>
+      </div>
+      <div class="col-sm-5 col-xs-5 text-right">
+        <div>
+          <span data-test="cart-subtotal-price">
+            <BaseMoney :money="subtotal"/>
+          </span>
+        </div>
+        <div>
+          <!--<span class="order-discount">{{ cart.discount }}</span>-->
+        </div>
+        <div>
+          <span v-if="cartLike.shippingInfo">
+            <BaseMoney :money="cartLike.shippingInfo.price"/>
+          </span>
+        </div>
+        <hr>
+        <div>
+          <span v-if="taxes">
+            <BaseMoney :money="taxes"/>
+          </span>
+        </div>
+        <div>
+          <span data-test="cart-total-price"
+                class="order-total">
+            <BaseMoney :money="cartLike.totalPrice"/>
+          </span>
+        </div>
       </div>
+
+      <!--{{#if checkoutConfirmation}}-->
+      <!--<div class="complete-order">-->
+        <!--<button id="confirmation-completeorder-btn"-->
+                <!--class="btn complete-order-btn">{{ $t('checkout.completeMyOrder') }}</button>-->
+        <!--<br>-->
+      <!--</div>-->
+      <!--{{/if}}-->
     </div>
   </div>
 </template>
diff --git a/src/components/common/CartLikeSummary.vue b/src/components/common/CartLikeSummary.vue
index 49aa263e..806aa10c 100644
--- a/src/components/common/CartLikeSummary.vue
+++ b/src/components/common/CartLikeSummary.vue
@@ -29,8 +29,8 @@
             <span class="visible-xs">{{ $t('quantity') }}:</span>
             <span data-test="cart-line-item-quantity"
                   class="quantity-number">
-                {{ lineItem.quantity }}
-              </span>
+              {{ lineItem.quantity }}
+            </span>
           </div>
         </slot>
       </div>
@@ -45,19 +45,18 @@
           <div class="text-right cart-item-price">
             <span class="visible-xs xs-price-title">{{ $t('total') }}</span>
             <span data-test="cart-line-item-total-price">
-          <BaseMoney :money="lineItem.totalPrice"/>
-        </span>
+              <BaseMoney :money="lineItem.totalPrice"/>
+            </span>
           </div>
         </div>
       </div>
-      <!--{{> checkout/order-summary/discount-code-input}}-->
-      <!--{{> checkout/order-summary/discount-summary}}-->
-      <!--{{#if checkoutConfirmation}}-->
-      <!--{{> checkout/order-summary/confirmation-checkboxes}}-->
-      <!--{{/if}}-->
     </div>
-    <CartLikePriceDetail :cartLike="cartLike"
-                         class="total-price-calc"/>
+    <div class="row">
+      <div class="col-sm-12">
+        <CartLikePriceDetail :cartLike="cartLike"
+                             class="total-price-calc"/>
+      </div>
+    </div>
   </div>
 </template>
 
diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue
index 9ec0effd..8ff22024 100644
--- a/src/components/header/MiniCart.vue
+++ b/src/components/header/MiniCart.vue
@@ -88,14 +88,6 @@ export default {
     show() {
       return this.$store.state.miniCartOpen;
     },
-
-    sortedLineItems() {
-      if (this.me && this.me.activeCart) {
-        const { lineItems } = this.me.activeCart;
-        return lineItems.reverse();
-      }
-      return [];
-    },
   },
 
   methods: {
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index 6a9e9b7f..f3e13369 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -9,6 +9,13 @@ export default {
       }
       return 0;
     },
+
+    sortedLineItems() {
+      if (this.me && this.me.activeCart) {
+        return [...this.me.activeCart.lineItems].reverse();
+      }
+      return [];
+    },
   },
 
   methods: {
diff --git a/templates/partials/checkout/start-checkout-link.hbs b/templates/partials/checkout/start-checkout-link.hbs
deleted file mode 100644
index e666383f..00000000
--- a/templates/partials/checkout/start-checkout-link.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="checkout-now {{#if bottom}}checkout-now-bottom{{/if}}">
-  <a href="{{@root.meta._links.checkout.href}}" class="pull-right text-uppercase checkout-now-btn" {{#if id}}id="{{id}}"{{/if}}>{{i18n "main:common.checkout"}}</a>
-</div>
\ No newline at end of file

From f829248bd67b9d8dc2f3ea79218df3fe8cb28599 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Apr 2019 17:23:07 +0200
Subject: [PATCH 05/69] Create component for form fields and display shipping
 address form

---
 src/assets/scss/_login-box.scss               |   2 -
 .../scss/_my-account-personal-details.scss    |   3 -
 src/assets/scss/_signup-box.scss              |   3 +-
 src/components/checkout/BaseAddressForm.vue   | 170 ++++++++++++++++++
 .../{CheckoutCart.vue => CartOverview.vue}    |  14 --
 .../{CheckoutAddress.vue => PageCheckout.vue} |  32 ++--
 src/components/checkout/StepAddressForm.vue   |  98 ++++++++++
 ...{ValidationError.vue => BaseFormField.vue} |  54 ++++--
 src/components/login/LoginForm.vue            |  20 ++-
 src/components/login/SignUpForm.vue           |  53 +++---
 .../productdetail/AddToCartForm.vue           |   8 +-
 .../useraccount/PageUserAccount.vue           |   9 +-
 src/components/useraccount/SidebarMenu.vue    |   8 +-
 .../userdetail/EditProfileForm.vue            |  22 +--
 src/i18n/de.yaml                              |  17 --
 src/i18n/en.yaml                              |  17 --
 src/router.js                                 |   9 +-
 17 files changed, 402 insertions(+), 137 deletions(-)
 create mode 100644 src/components/checkout/BaseAddressForm.vue
 rename src/components/checkout/{CheckoutCart.vue => CartOverview.vue} (88%)
 rename src/components/checkout/{CheckoutAddress.vue => PageCheckout.vue} (77%)
 create mode 100644 src/components/checkout/StepAddressForm.vue
 rename src/components/common/{ValidationError.vue => BaseFormField.vue} (80%)

diff --git a/src/assets/scss/_login-box.scss b/src/assets/scss/_login-box.scss
index 6100ac71..c3ab3696 100644
--- a/src/assets/scss/_login-box.scss
+++ b/src/assets/scss/_login-box.scss
@@ -24,11 +24,9 @@
   }
 }
 .login-box-input {
-  margin-top: 10px;
   span {
     text-transform: uppercase;
     display: inline-block;
-    padding-bottom: 5px;
   }
   input {
     width: 100%;
diff --git a/src/assets/scss/_my-account-personal-details.scss b/src/assets/scss/_my-account-personal-details.scss
index 039ed02f..6a26ee62 100644
--- a/src/assets/scss/_my-account-personal-details.scss
+++ b/src/assets/scss/_my-account-personal-details.scss
@@ -170,9 +170,6 @@
   padding: 0.5em;
   margin-top: 0.2em;
 }
-.form-sections {
-  padding-top: 15px;;
-}
 .form-notes {
   font-size: 12px;
   color: $gray;
diff --git a/src/assets/scss/_signup-box.scss b/src/assets/scss/_signup-box.scss
index f1b73f5a..16a861bb 100644
--- a/src/assets/scss/_signup-box.scss
+++ b/src/assets/scss/_signup-box.scss
@@ -23,11 +23,9 @@
   padding: 20px 0 30px;
 }
 .signup-box-input {
-  margin-top: 10px;
   span {
     text-transform: uppercase;
     display: inline-block;
-    padding-bottom: 5px;
   }
   input {
     width: 100%;
@@ -47,6 +45,7 @@
 .signup-box-terms {
   margin-top: 5px;
   input {
+    float: left;
     margin-right: 5px;
   }
   a {
diff --git a/src/components/checkout/BaseAddressForm.vue b/src/components/checkout/BaseAddressForm.vue
new file mode 100644
index 00000000..4f343885
--- /dev/null
+++ b/src/components/checkout/BaseAddressForm.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="address-form">
+    <div class="row">
+      <div class="col-sm-6">
+        <BaseFormField :vuelidate="$v.firstName"
+                       :label="$t('firstName')">
+          <input v-model.trim.lazy="$v.firstName.$model"
+                 autocomplete="fname"
+                 type="text"
+                 class="checkout-input-field"/>
+        </BaseFormField>
+      </div>
+      <div class="col-sm-6">
+        <BaseFormField :vuelidate="$v.lastName"
+                       :label="$t('lastName')">
+          <input v-model.trim.lazy="$v.lastName.$model"
+                 autocomplete="lname"
+                 type="text"
+                 class="checkout-input-field"/>
+        </BaseFormField>
+      </div>
+      <div class="col-sm-12">
+        <BaseFormField :vuelidate="$v.streetName"
+                       :label="$t('streetName')">
+          <input v-model.trim.lazy="$v.streetName.$model"
+                 autocomplete="shipping street-address"
+                 type="text"
+                 class="checkout-input-field"/>
+        </BaseFormField>
+      </div>
+      <div class="col-sm-12">
+        <BaseFormField :vuelidate="$v.additionalStreetInfo"
+                       :label="$t('additionalStreetInfo')">
+          <input v-model.trim.lazy="$v.additionalStreetInfo.$model"
+                 type="text"
+                 class="checkout-input-field"/>
+        </BaseFormField>
+      </div>
+      <div class="col-sm-4">
+        <BaseFormField :vuelidate="$v.city"
+                       :label="$t('city')">
+          <input v-model.trim.lazy="$v.city.$model"
+                 autocomplete="shipping locality"
+                 type="text"
+                 class="checkout-input-field"/>
+        </BaseFormField>
+      </div>
+      <div class="col-sm-3">
+        <BaseFormField :vuelidate="$v.postalCode"
+                       :label="$t('postalCode')">
+          <input v-model.trim.lazy="$v.postalCode.$model"
+                 autocomplete="shipping postal-code"
+                 type="text"
+                 class="checkout-input-field"/>
+        </BaseFormField>
+      </div>
+      <div class="col-sm-5">
+        <BaseFormField :vuelidate="$v.country"
+                       :label="$t('country')">
+
+        <!--<div class="country input-block">-->
+          <select v-model.lazy="$v.country.$model"
+                  class="checkout-dropdown">
+            <!--{{#each options.list}}-->
+            <!--<option value="{{value}}" {{#if selected}}selected{{/if}}>{{label}}</option>-->
+            <!--{{/each}}-->
+          </select>
+        </BaseFormField>
+      </div>
+    </div>
+    <hr>
+    <div class="row">
+      <div class="col-sm-6">
+        <BaseFormField :vuelidate="$v.phone"
+                       :label="$t('phone')">
+          <input v-model.trim.lazy="$v.phone.$model"
+                 autocomplete="tel"
+                 type="text"
+                 class="checkout-input-field"/>
+        </BaseFormField>
+      </div>
+      <div class="col-sm-6">
+        <BaseFormField :vuelidate="$v.email"
+                       :label="$t('email')">
+          <input v-model.trim.lazy="$v.email.$model"
+                 autocomplete="email"
+                 type="text"
+                 class="checkout-input-field"/>
+        </BaseFormField>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { required, email } from 'vuelidate/lib/validators';
+import BaseFormField from '../common/BaseFormField.vue';
+
+export default {
+  components: {
+    BaseFormField,
+  },
+
+  data: () => ({
+    firstName: null,
+    lastName: null,
+    streetName: null,
+    additionalStreetInfo: null,
+    city: null,
+    postalCode: null,
+    country: null,
+    phone: null,
+    email: null,
+  }),
+
+  validations() {
+    return {
+      firstName: {
+        required,
+      },
+      lastName: {
+        required,
+      },
+      streetName: {
+        required,
+      },
+      additionalStreetInfo: {
+      },
+      city: {
+        required,
+      },
+      postalCode: {
+        required,
+      },
+      country: {
+        required,
+      },
+      phone: {
+      },
+      email: {
+        required,
+        email,
+      },
+    };
+  },
+};
+</script>
+
+<i18n>
+en:
+  firstName: "First Name"
+  lastName: "Last Name"
+  streetName: "Address"
+  additionalStreetInfo: "Additional address info"
+  city: "City"
+  postalCode: "Postal Code"
+  country: "Country"
+  email: "Email"
+  phone: "Phone"
+de:
+  firstName: "Vorname"
+  lastName: "Nachname"
+  streetName: "Straße und Hausnummer"
+  additionalStreetInfo: "Adresszusatz"
+  city: "Stadt"
+  postalCode: "PLZ"
+  country: "Land"
+  email: "E-Mail-Adresse"
+  phone: "Telefon"
+</i18n>
diff --git a/src/components/checkout/CheckoutCart.vue b/src/components/checkout/CartOverview.vue
similarity index 88%
rename from src/components/checkout/CheckoutCart.vue
rename to src/components/checkout/CartOverview.vue
index 9e672cc0..88604aef 100644
--- a/src/components/checkout/CheckoutCart.vue
+++ b/src/components/checkout/CartOverview.vue
@@ -151,7 +151,6 @@ export default {
     price: "Price"
     total: "Total"
 
-    billingAddress: "Billing Address"
     completeMyOrder: "Complete My Order"
     continueCheckout: "Continue Checkout"
     needHelpCustomerService: "Need help? Customer Service"
@@ -161,14 +160,8 @@ export default {
     paymentInformation: "Payment Details"
     promoCodeApplied: "Promotional Code Applied"
     rememberMe: "Save my details to create my personal account at SUNRISE"
-    shippingAddress: "Shipping Address"
     shippingInformation: "Shipping Information"
     shippingMethod: "Shipping Method"
-    shippingPage:
-      title: "Secure Checkout - Shipping"
-      differentBillingAddressCheckboxLabel: "Use a different address for billing"
-      emailInfo: "We require your email address to send your shipping and order confirmation"
-      telNumberInfo: "Please provide your telephone number so the shipper can contact you during delivery"
     paymentPage:
       title: "Secure Checkout - Payment"
       cardName: "Name on credit card"
@@ -192,7 +185,6 @@ export default {
     price: "Preis"
     total: "Gesamtpreis"
 
-    billingAddress: "Zahlungsadresse"
     completeMyOrder: "Zahlungspflichtig bestellen"
     continueCheckout: "Weiter"
     needHelpCustomerService: "Brauchen Sie Hilfe? Kundenservice"
@@ -202,14 +194,8 @@ export default {
     paymentInformation: "Zahlungsdetails"
     promoCodeApplied: "Gutschein eingelöst"
     rememberMe: "Meine Daten speichern für einen Account"
-    shippingAddress: "Versandadresse"
     shippingInformation: "Versand Information"
     shippingMethod: "Versandart"
-    shippingPage:
-      title: "Sicherer Bestellprozess - Versand"
-      differentBillingAddressCheckboxLabel: "Abweichende Adresse als Rechnungsadresse verwenden."
-      emailInfo: "Bitte geben Sie Ihre E-Mail-Adresse an, damit wir Sie über den Status und Versand Ihrer Bestellung informieren können."
-      telNumberInfo: "Bitte geben Sie Ihre Telefonnummer an, damit unser Lieferant Sie über den Liefertermin informieren kann."
     paymentPage:
       title: "Sicherer Bestellprozess - Bezahlung"
       cardName: "Name auf der Kreditkarte"
diff --git a/src/components/checkout/CheckoutAddress.vue b/src/components/checkout/PageCheckout.vue
similarity index 77%
rename from src/components/checkout/CheckoutAddress.vue
rename to src/components/checkout/PageCheckout.vue
index b2b8ea98..fe0417dc 100644
--- a/src/components/checkout/CheckoutAddress.vue
+++ b/src/components/checkout/PageCheckout.vue
@@ -36,10 +36,10 @@
           <div class="checkout">
             <div class="row">
               <div class="col-sm-7">
-                <!--{{> checkout/address-form addressForm=content.addressForm settings=content.addressFormSettings}}-->
+                <component :is="showStep"/>
               </div>
               <div class="col-sm-5">
-                <CheckoutCart/>
+                <CartOverview/>
               </div>
             </div>
           </div>
@@ -50,24 +50,28 @@
 </template>
 
 <script>
-import CheckoutCart from './CheckoutCart.vue';
+import CartOverview from './CartOverview.vue';
+import StepAddressForm from './StepAddressForm.vue';
 
 export default {
   components: {
-    CheckoutCart,
+    CartOverview,
+    StepAddressForm,
   },
+
+  props: ['showStep'],
 };
 </script>
 
 <i18n>
-  en:
-    securePayment: "Secure payment"
-    shipping: "Shipping"
-    payment: "Payment"
-    confirmation: "Confirmation"
-  de:
-    securePayment: "Sichere Bezahlung"
-    shipping: "Versand"
-    payment: "Zahlung"
-    confirmation: "Bestätigung"
+en:
+  securePayment: "Secure payment"
+  shipping: "Shipping"
+  payment: "Payment"
+  confirmation: "Confirmation"
+de:
+  securePayment: "Sichere Bezahlung"
+  shipping: "Versand"
+  payment: "Zahlung"
+  confirmation: "Bestätigung"
 </i18n>
diff --git a/src/components/checkout/StepAddressForm.vue b/src/components/checkout/StepAddressForm.vue
new file mode 100644
index 00000000..ced2c8da
--- /dev/null
+++ b/src/components/checkout/StepAddressForm.vue
@@ -0,0 +1,98 @@
+<template>
+  <form>
+    <div class="shipping-info">
+      <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
+      <span class="pull-right required-fields">{{ $t('form.required') }} *</span>
+    </div>
+    <BaseAddressForm/>
+
+    <!--<div class="row different-billing-row">-->
+      <!--<div class="col-sm-12">-->
+        <!--<div class="different-for-billing input-block">-->
+          <!--<label for="different-billing-checkbox">-->
+          <!--<span>-->
+            <!--<input id="different-billing-checkbox" type="checkbox" value="true"
+            name="billingAddressDifferentToBillingAddress"
+            {{#if addressForm.billingAddressDifferentToBillingAddress}} checked{{/if}}>-->
+          <!--</span>-->
+            <!--<span>{{ $t('checkout:shippingPage.differentBillingAddressCheckboxLabel') }}</span>-->
+          <!--</label>-->
+        <!--</div>-->
+      <!--</div>-->
+    <!--</div>-->
+    <!--<div class="row">-->
+      <!--<div class="col-sm-12">-->
+        <!--<div id="different-billing-address">-->
+          <!--<div class="row">-->
+            <!--<div class="row">-->
+              <!--<div class="col-sm-4">-->
+                <!--{{> form/choose-title containerClass="title" selectId="billing-title-select"
+                 selectName="titleBilling" options=settings.titleBilling}}-->
+              <!--</div>-->
+            <!--</div>-->
+            <!--<div class="row">-->
+              <!--{{> form/input-text columnWidth=6 name="firstNameBilling" labelKey="form.firstName"
+              required=true value=addressForm.firstNameBilling settings=settings.firstNameBilling}}-->
+              <!--{{> form/input-text columnWidth=6 name="lastNameBilling" labelKey="form.lastName"
+              required=true value=addressForm.lastNameBilling settings=settings.lastNameBilling}}-->
+              <!--{{> form/input-text columnWidth=12 name="streetNameBilling" labelKey="form.addressOne"
+               required=true value=addressForm.streetNameBilling settings=settings.streetNameBilling}}-->
+              <!--{{> form/input-text columnWidth=12 name="additionalStreetInfoBilling" labelKey="form.addressTwo"
+               required=false value=addressForm.additionalStreetInfoBilling
+               settings=settings.additionalStreetInfoBilling}}-->
+              <!--{{> form/input-text columnWidth=8 name="cityBilling" labelKey="form.city"
+              required=true value=addressForm.cityBilling settings=settings.cityBilling}}-->
+              <!--{{> form/input-text columnWidth=4 name="postalCodeBilling" labelKey="form.postCode"
+              required=true value=addressForm.postalCodeBilling settings=settings.postalCodeBilling}}-->
+              <!--<div class="col-sm-6">-->
+                <!--{{> form/choose-country containerClass="country" selectId="billing-country-select"
+                selectName="countryBilling" options=settings.countriesBilling}}-->
+              <!--</div>-->
+              <!--{{> form/input-text columnWidth=6 name="regionBilling" labelKey="form.region" required=false
+              value=addressForm.regionBilling settings=settings.regionBilling}}-->
+            <!--</div>-->
+            <!--<hr>-->
+            <!--<div class="row">-->
+              <!--{{> form/input-text columnWidth=6 name="phoneBilling" labelKey="form.phone" required=false
+               value=addressForm.phoneBilling settings=settings.phoneBilling}}-->
+              <!--{{> form/input-text columnWidth=6 name="emailBilling" labelKey="form.email" required=true
+               value=addressForm.emailBilling settings=settings.emailBilling}}-->
+            <!--</div>-->
+          <!--</div>-->
+        <!--</div>-->
+      <!--</div>-->
+    <!--</div>-->
+    <!--{{> checkout/continue-checkout-button}}-->
+  </form>
+</template>
+
+<script>
+import BaseAddressForm from './BaseAddressForm.vue';
+
+export default {
+  components: {
+    BaseAddressForm,
+  },
+};
+</script>
+
+<style scoped>
+.address-form {
+  margin: 0.5em 1em;
+}
+</style>
+
+<i18n>
+en:
+  shippingInformation: "Shipping Information"
+  shippingAddress: "Shipping Address"
+  billingAddress: "Billing Address"
+  title: "Secure Checkout - Shipping"
+  differentBillingAddressCheckboxLabel: "Use a different address for billing"
+de:
+  shippingInformation: "Versand Information"
+  billingAddress: "Zahlungsadresse"
+  shippingAddress: "Versandadresse"
+  title: "Sicherer Bestellprozess - Versand"
+  differentBillingAddressCheckboxLabel: "Abweichende Adresse als Rechnungsadresse verwenden."
+</i18n>
diff --git a/src/components/common/ValidationError.vue b/src/components/common/BaseFormField.vue
similarity index 80%
rename from src/components/common/ValidationError.vue
rename to src/components/common/BaseFormField.vue
index 5c42740f..ba2ce57c 100644
--- a/src/components/common/ValidationError.vue
+++ b/src/components/common/BaseFormField.vue
@@ -1,5 +1,15 @@
 <template>
-<div :class="vuelidate.$error ? 'form-error': ''">
+<div class="form-field"
+     :class="{ 'form-error': vuelidate.$error, 'labelled': label }">
+  <span v-if="label"
+        class="field-label text-uppercase">
+    {{ label }}
+    <span v-if="required"
+          :title="$t('required')"
+          class="field-required">
+      *
+    </span>
+  </span>
   <slot></slot>
   <div v-if="vuelidate.$error"
        data-test="validation-error-list">
@@ -28,12 +38,19 @@ export default {
       type: Object,
       default() { return {}; },
     },
+    label: {
+      type: String,
+    },
   },
 
   computed: {
     validations() {
       return Object.keys(this.vuelidate.$params);
     },
+
+    required() {
+      return this.vuelidate.$params.required;
+    },
   },
 
   methods: {
@@ -49,19 +66,6 @@ export default {
 };
 </script>
 
-<i18n>
-en:
-  unknownValidation: "Invalid field"
-  required: "Required field"
-  email: "A valid email is required"
-  minLength: "It should contain at least {min} characters"
-de:
-  unknownValidation: "Ungültiger Feldwert"
-  required: "Pflichtfeld"
-  email: "Eine gültige E-Mail ist erforderlich"
-  minLength: "Es sollte mindestens {min} Zeichen enthalten"
-</i18n>
-
 <style lang="scss" scoped>
 .form-error-bubble {
   position: absolute;
@@ -92,4 +96,26 @@ de:
 .form-error input:not([type=checkbox]) {
   border-color: rgba(206, 65, 65, 0.6);
 }
+
+.field-required {
+  color: #D54D4D;
+  cursor: default;
+}
+
+.form-field.labelled {
+  padding-top: 15px;
+}
 </style>
+
+<i18n>
+en:
+  unknownValidation: "Invalid field"
+  required: "Required field"
+  email: "A valid email is required"
+  minLength: "It should contain at least {min} characters"
+de:
+  unknownValidation: "Ungültiger Feldwert"
+  required: "Pflichtfeld"
+  email: "Eine gültige E-Mail ist erforderlich"
+  minLength: "Es sollte mindestens {min} Zeichen enthalten"
+</i18n>
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index 8c9ddcf7..a5383c4d 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -18,22 +18,22 @@
           </template>
         </ServerError>
         <div class="login-box-input">
-          <span>{{ $t('email') }}*</span><br>
-          <ValidationError :vuelidate="$v.email">
+          <BaseFormField :vuelidate="$v.email"
+                         :label="$t('email')">
             <input v-model.trim.lazy="$v.email.$model"
                    autocomplete="username"
                    type="email"
                    data-test="login-form-email" />
-          </ValidationError>
+          </BaseFormField>
         </div>
         <div class="login-box-input">
-          <span>{{ $t('password') }}*</span><br>
-          <ValidationError :vuelidate="$v.password">
+          <BaseFormField :vuelidate="$v.password"
+                         :label="$t('password')">
             <input v-model.trim.lazy="$v.password.$model"
                    autocomplete="current-password"
                    type="password"
                    data-test="login-form-password" />
-          </ValidationError>
+          </BaseFormField>
         </div>
         <div class="clearfix">
           <div class="pull-left">
@@ -66,11 +66,15 @@ import { required, email } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
 import { clientLogin } from '@/auth';
 import ServerError from '../common/ServerError.vue';
-import ValidationError from '../common/ValidationError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
+import BaseFormField from '../common/BaseFormField.vue';
 
 export default {
-  components: { ServerError, ValidationError, LoadingButton },
+  components: {
+    BaseFormField,
+    ServerError,
+    LoadingButton,
+  },
 
   data: () => ({
     email: null,
diff --git a/src/components/login/SignUpForm.vue b/src/components/login/SignUpForm.vue
index 8a06a51f..4034fa85 100644
--- a/src/components/login/SignUpForm.vue
+++ b/src/components/login/SignUpForm.vue
@@ -19,59 +19,59 @@
       <div class="row">
         <div class="col-sm-6">
           <div class="signup-box-input">
-            <span>{{ $t('firstName') }}*</span><br>
-            <ValidationError :vuelidate="$v.firstName">
+            <BaseFormField :vuelidate="$v.firstName"
+                           :label="$t('firstName')">
               <input v-model.trim.lazy="$v.firstName.$model"
                      autocomplete="fname"
                      type="text"
                      data-test="signup-form-firstname" />
-            </ValidationError>
+            </BaseFormField>
           </div>
         </div>
         <div class="col-sm-6">
           <div class="signup-box-input">
-            <span>{{ $t('secondName') }}*</span><br>
-            <ValidationError :vuelidate="$v.lastName">
+            <BaseFormField :vuelidate="$v.lastName"
+                           :label="$t('secondName')">
               <input v-model.trim.lazy="$v.lastName.$model"
                      autocomplete="lname"
                      type="text"
                      data-test="signup-form-lastname" >
-            </ValidationError>
+            </BaseFormField>
           </div>
         </div>
       </div>
       <hr class="signup-box-hr">
       <div class="signup-box-input">
-        <span>{{ $t('email') }}*</span><br>
-        <ValidationError :vuelidate="$v.email">
+        <BaseFormField :vuelidate="$v.email"
+                       :label="$t('email')">
           <input v-model.trim.lazy="$v.email.$model"
                  autocomplete="username"
                  type="email"
                  data-test="signup-form-email" />
-        </ValidationError>
+        </BaseFormField>
       </div>
       <div class="row">
         <div class="col-sm-6">
           <div class="signup-box-input">
-            <span>{{ $t('password') }}*</span><br/>
-            <ValidationError :vuelidate="$v.password">
+            <BaseFormField :vuelidate="$v.password"
+                           :label="$t('password')">
               <input v-model.trim.lazy="$v.password.$model"
                      autocomplete="off"
                      type="password"
                      data-test="signup-form-password" />
-            </ValidationError>
+            </BaseFormField>
           </div>
         </div>
         <div class="col-sm-6">
           <div class="signup-box-input">
-            <span>{{ $t('repeatPassword') }}*</span><br>
-            <ValidationError :vuelidate="$v.repeatPassword"
-                             :customMessages="{ sameAsPassword: $t('repeatPasswordError') }">
+            <BaseFormField :vuelidate="$v.repeatPassword"
+                           :label="$t('repeatPassword')"
+                           :customMessages="{ sameAsPassword: $t('repeatPasswordError') }">
               <input v-model.trim.lazy="$v.repeatPassword.$model"
                      autocomplete="off"
                      type="password"
                      data-test="signup-form-repeatpassword" />
-            </ValidationError>
+            </BaseFormField>
           </div>
         </div>
       </div>
@@ -82,14 +82,14 @@
         <!--<span>{{ $t('pleaseAddMe') }} <a href="">{{ $t('newsletter') }}</a></span>-->
       <!--</div>-->
       <div class="signup-box-terms">
-        <ValidationError :vuelidate="$v.agreeToTerms"
-                         :customMessages="{ mustBeAgreed: $t('agreeToTermsError') }">
+        <BaseFormField :vuelidate="$v.agreeToTerms"
+                       :label="$t('agreeTo')"
+                       :customMessages="{ mustBeAgreed: $t('agreeToTermsError') }">
           <input v-model.trim.lazy="$v.agreeToTerms.$model"
                  autocomplete="off"
                  type="checkbox"
                  data-test="signup-form-agreetoterms" />
-          <span>{{ $t('agreeTo') }}</span>
-        </ValidationError>
+        </BaseFormField>
       </div>
       <LoadingButton :buttonState="buttonState"
                      class="signup-register-btn"
@@ -107,11 +107,15 @@ import {
 import gql from 'graphql-tag';
 import { clientLogin } from '@/auth';
 import ServerError from '../common/ServerError.vue';
-import ValidationError from '../common/ValidationError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
+import BaseFormField from '../common/BaseFormField.vue';
 
 export default {
-  components: { ServerError, ValidationError, LoadingButton },
+  components: {
+    BaseFormField,
+    ServerError,
+    LoadingButton,
+  },
 
   data: () => ({
     firstName: null,
@@ -188,6 +192,7 @@ export default {
       sameAsPassword: sameAs('password'),
     },
     agreeToTerms: {
+      required,
       mustBeAgreed: sameAs(() => true),
     },
   },
@@ -209,7 +214,7 @@ en:
   repeatPasswordError: "Passwords do not match"
   pleaseAddMe: "Please add me to the"
   newsletter: "SUNRISE Newsletter"
-  agreeTo: "I agree to the Terms and Conditions."
+  agreeTo: "I agree to the Terms and Conditions"
   agreeToTermsError: "You must agree to the terms"
   registerNow: "Register Now"
   duplicatedEmail: "A customer with this email already exists"
@@ -227,7 +232,7 @@ de:
   repeatPasswordError: "Passwörter stimmen nicht überein"
   pleaseAddMe: "Anmeldung zum"
   newsletter: "SUNRISE Newsletter"
-  agreeTo: "Ich stimme den AGB zu."
+  agreeTo: "Ich stimme den AGB zu"
   agreeToTermsError: "Sie müssen den Bedingungen zustimmen"
   registerNow: "Jetzt registieren"
   duplicatedEmail: "Ein Kunde mit dieser E-Mail existiert bereits"
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index 4ebed69f..7cfb6850 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -15,12 +15,12 @@
     <div class="row">
       <ul class="product-actions-list list-inline">
         <li class="bag-items-li">
-          <ValidationError :vuelidate="$v.quantity">
+          <BaseFormField :vuelidate="$v.quantity">
             <SelectBoxIt :options="quantities"
                          v-model.lazy.number="$v.quantity.$model"
                          data-test="add-to-cart-form-quantity-dropdown"
                          class="bag-items"/>
-          </ValidationError>
+          </BaseFormField>
         </li>
         <li>
           <LoadingButton :buttonState="buttonState"
@@ -43,8 +43,8 @@ import { required, numeric, between } from 'vuelidate/lib/validators';
 import cartMixin from '@/mixins/cartMixin';
 import priceMixin from '@/mixins/priceMixin';
 import ServerError from '../common/ServerError.vue';
-import ValidationError from '../common/ValidationError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
+import BaseFormField from '../common/BaseFormField.vue';
 
 const query = gql`
   query me {
@@ -65,8 +65,8 @@ export default {
   },
 
   components: {
+    BaseFormField,
     LoadingButton,
-    ValidationError,
     ServerError,
   },
 
diff --git a/src/components/useraccount/PageUserAccount.vue b/src/components/useraccount/PageUserAccount.vue
index 70646cf3..92c5debd 100644
--- a/src/components/useraccount/PageUserAccount.vue
+++ b/src/components/useraccount/PageUserAccount.vue
@@ -9,7 +9,7 @@
           <div class="col-sm-3">
             <SidebarMenu :showTab="showTab"/>
           </div>
-          <component :is="showTab"></component>
+          <component :is="showTab"/>
         </div>
       </div>
     </div>
@@ -24,9 +24,12 @@ import OrderDetail from './myorders/OrderDetail.vue';
 
 export default {
   props: ['showTab'],
-  name: 'UserAccount',
+
   components: {
-    SidebarMenu, TabPersonalDetails, TabOrderList, OrderDetail,
+    SidebarMenu,
+    TabPersonalDetails,
+    TabOrderList,
+    OrderDetail,
   },
 };
 </script>
diff --git a/src/components/useraccount/SidebarMenu.vue b/src/components/useraccount/SidebarMenu.vue
index 049a6f52..5dd0857d 100644
--- a/src/components/useraccount/SidebarMenu.vue
+++ b/src/components/useraccount/SidebarMenu.vue
@@ -2,7 +2,7 @@
   <div class="my-account-sidebar">
     <div id="my-account-mobile-content"
          class="my-account-sidebar-items"
-         :class="{ active: showTab === 'TabPersonalDetails' }">
+         :class="{ active: isActiveTab('TabPersonalDetails') }">
       <router-link :to="{ name: 'user' }">
         <button>
           {{ $t("personalDetails") }}
@@ -10,7 +10,7 @@
       </router-link>
     </div>
     <div class="my-account-sidebar-items"
-         :class="{ active: showTab === 'TabOrderDetail' }">
+         :class="{ active: isActiveTab('TabOrderDetail') }">
       <router-link :to="{ name: 'orders' }">
         <button data-test="my-orders-button">
           {{ $t("myOrders") }}
@@ -39,6 +39,10 @@ export default {
         },
       }));
     },
+
+    isActiveTab(tab) {
+      return this.showTab === tab;
+    },
   },
 };
 </script>
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index 3717a7c0..4213f5d8 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -11,25 +11,25 @@
       <div class="row">
         <div class="col-sm-6">
           <div class="form-sections">
-            <span class="form-labels">{{ $t('firstName') }}*</span><br>
-            <ValidationError :vuelidate="$v.firstName">
+            <BaseFormField :vuelidate="$v.firstName"
+                           :label="$t('firstName')">
               <input v-model.trim.lazy="$v.firstName.$model"
                      autocomplete="fname"
                      type="text"
                      class="form-inputs"
                      data-test="edit-profile-form-firstname"/>
-            </ValidationError>
+            </BaseFormField>
           </div>
 
           <div class="form-sections">
-            <span class="form-labels">{{ $t('email') }}*</span><br>
-            <ValidationError :vuelidate="$v.email">
+            <BaseFormField :vuelidate="$v.email"
+                           :label="$t('email')">
               <input v-model.trim.lazy="$v.email.$model"
                      autocomplete="email"
                      type="email"
                      class="form-inputs"
                      data-test="edit-profile-form-email"/>
-            </ValidationError>
+            </BaseFormField>
             <br>
             <span class="form-notes"></span>
           </div>
@@ -37,14 +37,14 @@
         </div>
         <div class="col-sm-6">
           <div class="form-sections">
-            <span class="form-labels">{{ $t('lastName') }}*</span><br>
-            <ValidationError :vuelidate="$v.lastName">
+            <BaseFormField :vuelidate="$v.lastName"
+                           :label="$t('lastName')">
               <input v-model.trim.lazy="$v.lastName.$model"
                      autocomplete="lname"
                      type="text"
                      class="form-inputs"
                      data-test="edit-profile-form-lastname"/>
-            </ValidationError>
+            </BaseFormField>
           </div>
         </div>
       </div>
@@ -83,13 +83,13 @@ import { required, email } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
 import customerMixin from '@/mixins/customerMixin';
 import ServerError from '../../common/ServerError.vue';
-import ValidationError from '../../common/ValidationError.vue';
 import LoadingButton from '../../common/LoadingButton.vue';
+import BaseFormField from '../../common/BaseFormField.vue';
 
 export default {
   components: {
+    BaseFormField,
     LoadingButton,
-    ValidationError,
     ServerError,
   },
 
diff --git a/src/i18n/de.yaml b/src/i18n/de.yaml
index 16387e05..de047acf 100644
--- a/src/i18n/de.yaml
+++ b/src/i18n/de.yaml
@@ -50,33 +50,17 @@ main:
       backorder: "Backorder"
       delayed: "Delayed"
   form:
-    addressOne: "Adresse 1"
-    addressTwo: "Adresse 2"
     apply: "Weiter"
-    city: "Stadt"
     cancel: "Abbrechen"
     choose: "Auswählen"
-    country: "Land"
     edit: "Bearbeiten"
-    email: "E-Mail-Adresse"
     emailRequired: "Wir benötigen Ihre E-Mail-Adresse, um Ihnen die Bestell- und Versand-Bestätigungs-E-Mails zu senden."
     delete: "Löschen"
-    firstName: "Vorname"
     formHasErrorsFlash: "Es ist ein Fehler aufgetreten"
-    lastName: "Nachname"
     month: "Monat"
-    personTitles:
-      mr: "Herr"
-      mrs: "Frau"
-      ms: "Frau"
-      dr: "Dr."
-    phone: "Telefon"
     phoneRequired: "Bitte geben Sie Ihre Telefonnummer an, damit der Lieferant Sie bei der Zustellung kontaktieren kann."
-    postCode: "PLZ"
-    region: "Region"
     required: "Pflichtfeld"
     submit: "Weiter"
-    title: "Titel"
     year: "Jahr"
   contactForm:
     pleaseFill: "Kontaktformular ausfüllen"
@@ -216,7 +200,6 @@ checkout:
   rememberMe: "Meine Daten speichern für einen Account"
   shipping: "Versand"
   shippingAddress: "Versandadresse"
-  shippingInformation: "Versand Information"
   shippingMethod: "Versandart"
   subtotal: "Zwischensumme"
   total: "Gesamtpreis"
diff --git a/src/i18n/en.yaml b/src/i18n/en.yaml
index d8b4e450..88a54201 100644
--- a/src/i18n/en.yaml
+++ b/src/i18n/en.yaml
@@ -50,33 +50,17 @@ main:
       backorder: "Backorder"
       delayed: "Delayed"
   form:
-    addressOne: "Address 1"
-    addressTwo: "Address 2"
     apply: "Apply"
-    city: "City"
     cancel: "Cancel"
     choose: "Choose"
-    country: "Country"
     edit: "Edit"
-    email: "Email"
     emailRequired: "We require your email address to send your shipping and order confirmation"
     delete: "Delete"
-    firstName: "First Name"
     formHasErrorsFlash: "The form contains errors."
-    lastName: "Last Name"
     month: "Month"
-    personTitles:
-      mr: "Mr."
-      mrs: "Mrs."
-      ms: "Ms."
-      dr: "Dr."
-    phone: "Phone"
     phoneRequired: "Please provide your telephone number so the shipper can contact you during delivery"
-    postCode: "Post Code"
-    region: "Region"
     required: "Required"
     submit: "Submit"
-    title: "Title"
     year: "Year"
   contactForm:
     pleaseFill: "Please fill in our contact form"
@@ -214,7 +198,6 @@ checkout:
   rememberMe: "Save my details to create my personal account at SUNRISE"
   shipping: "Shipping"
   shippingAddress: "Shipping Address"
-  shippingInformation: "Shipping Information"
   shippingMethod: "Shipping Method"
   subtotal: "Subtotal"
   total: "Total"
diff --git a/src/router.js b/src/router.js
index 1f1d0696..30134de4 100644
--- a/src/router.js
+++ b/src/router.js
@@ -9,7 +9,7 @@ import PageUserAccount from '@/components/useraccount/PageUserAccount.vue';
 import PageNotFound from '@/components/common/PageNotFound.vue';
 import PageProductDetail from '@/components/productdetail/PageProductDetail.vue';
 import PageCartDetail from '@/components/cartdetail/PageCartDetail.vue';
-import CheckoutAddress from '@/components/checkout/CheckoutAddress.vue';
+import PageCheckout from '@/components/checkout/PageCheckout.vue';
 
 Vue.use(Router);
 
@@ -124,9 +124,14 @@ const router = new Router({
       path: '/checkout',
       name: 'checkout',
       components: {
-        default: CheckoutAddress,
+        default: PageCheckout,
         header: TheHeader,
       },
+      props: {
+        default: {
+          showStep: 'StepAddressForm',
+        },
+      },
     },
   ],
 });

From 41f21c379ef613cfbace8cbd88f649d377035320 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 17 Apr 2019 13:53:07 +0200
Subject: [PATCH 06/69] Extract common form logic into a mixin

---
 .../cartdetail/LineItemQuantityForm.vue       |  4 +-
 src/components/login/LoginForm.vue            | 31 ++-----
 src/components/login/SignUpForm.vue           | 37 +++-----
 .../productdetail/AddToCartForm.vue           | 38 +++-----
 .../userdetail/EditProfileForm.vue            | 87 ++++++-------------
 src/mixins/formMixin.js                       | 23 +++++
 6 files changed, 84 insertions(+), 136 deletions(-)
 create mode 100644 src/mixins/formMixin.js

diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
index 110aabdb..38346db4 100644
--- a/src/components/cartdetail/LineItemQuantityForm.vue
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -42,9 +42,9 @@ export default {
 
   watch: {
     quantity(newValue, oldValue) {
-      if (oldValue !== null) {
+      if (oldValue !== null && newValue !== oldValue) {
         this.$v.$touch();
-        if (newValue !== oldValue && !this.$v.$invalid) {
+        if (!this.$v.$invalid) {
           this.debouncedSubmit();
         }
       }
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index a5383c4d..cc69a146 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -11,7 +11,7 @@
     <hr class="login-box-hr">
     <div class="login-box-description">{{ $t('description') }}</div>
     <div class="login-box-input-wrapper">
-      <form @submit.prevent="submit">
+      <form @submit.prevent="submit(customerSignMeIn)">
         <ServerError :error="serverError">
           <template slot-scope="{ graphQLError }">
             {{ getErrorMessage(graphQLError) }}
@@ -64,7 +64,8 @@
 <script>
 import { required, email } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
-import { clientLogin } from '@/auth';
+import { clientLogin } from '../../auth';
+import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/ServerError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
 import BaseFormField from '../common/BaseFormField.vue';
@@ -76,29 +77,14 @@ export default {
     LoadingButton,
   },
 
+  mixins: [formMixin],
+
   data: () => ({
-    email: null,
-    password: null,
-    buttonState: null,
-    serverError: null,
+    email: '',
+    password: '',
   }),
 
   methods: {
-    async submit() {
-      this.$v.$touch();
-      this.serverError = null;
-      if (!this.$v.$invalid) {
-        this.buttonState = 'loading';
-        await this.customerSignMeIn()
-          .then(() => clientLogin(this.email, this.password))
-          .then(() => this.$router.push({ name: 'user' }))
-          .catch((error) => {
-            this.serverError = error;
-            this.buttonState = null;
-          });
-      }
-    },
-
     customerSignMeIn() {
       return this.$apollo.mutate({
         mutation: gql`
@@ -115,7 +101,8 @@ export default {
             password: this.password,
           },
         },
-      });
+      }).then(() => clientLogin(this.email, this.password))
+        .then(() => this.$router.push({ name: 'user' }));
     },
 
     getErrorMessage({ code }) {
diff --git a/src/components/login/SignUpForm.vue b/src/components/login/SignUpForm.vue
index 4034fa85..a7f894c1 100644
--- a/src/components/login/SignUpForm.vue
+++ b/src/components/login/SignUpForm.vue
@@ -10,7 +10,7 @@
     </div>
     <hr class="signup-box-hr">
     <div class="signup-box-description">{{ $t('description') }}</div>
-    <form @submit.prevent="submit">
+    <form @submit.prevent="submit(customerSignMeUp)">
       <ServerError :error="serverError">
         <template slot-scope="{ graphQLError }">
           {{ getErrorMessage(graphQLError) }}
@@ -105,7 +105,8 @@ import {
   required, email, minLength, sameAs,
 } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
-import { clientLogin } from '@/auth';
+import { clientLogin } from '../../auth';
+import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/ServerError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
 import BaseFormField from '../common/BaseFormField.vue';
@@ -117,33 +118,18 @@ export default {
     LoadingButton,
   },
 
+  mixins: [formMixin],
+
   data: () => ({
-    firstName: null,
-    lastName: null,
-    email: null,
-    password: null,
-    repeatPassword: null,
+    firstName: '',
+    lastName: '',
+    email: '',
+    password: '',
+    repeatPassword: '',
     agreeToTerms: false,
-    buttonState: null,
-    serverError: null,
   }),
 
   methods: {
-    async submit() {
-      this.$v.$touch();
-      this.serverError = null;
-      if (!this.$v.$invalid) {
-        this.buttonState = 'loading';
-        await this.customerSignMeUp()
-          .then(() => clientLogin(this.email, this.password))
-          .then(() => this.$router.push({ name: 'user' }))
-          .catch((error) => {
-            this.serverError = error;
-            this.buttonState = null;
-          });
-      }
-    },
-
     customerSignMeUp() {
       return this.$apollo.mutate({
         mutation: gql`
@@ -162,7 +148,8 @@ export default {
             lastName: this.lastName,
           },
         },
-      });
+      }).then(() => clientLogin(this.email, this.password))
+        .then(() => this.$router.push({ name: 'user' }));
     },
 
     getErrorMessage({ code, field }) {
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index 7cfb6850..7463684e 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <form @submit.prevent="submit">
+  <form @submit.prevent="submit(addLineItem)">
     <ServerError :error="serverError"/>
     <div class="row select-row">
       <ul class="list-inline">
@@ -40,12 +40,14 @@
 <script>
 import gql from 'graphql-tag';
 import { required, numeric, between } from 'vuelidate/lib/validators';
-import cartMixin from '@/mixins/cartMixin';
-import priceMixin from '@/mixins/priceMixin';
+import cartMixin from '../../mixins/cartMixin';
+import priceMixin from '../../mixins/priceMixin';
+import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/ServerError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
 import BaseFormField from '../common/BaseFormField.vue';
 
+const MAX_QUANTITY = 10;
 const query = gql`
   query me {
     me {
@@ -70,38 +72,20 @@ export default {
     ServerError,
   },
 
+  mixins: [cartMixin, priceMixin, formMixin],
+
   data: () => ({
     me: null,
     quantity: 1,
-    buttonState: null,
-    serverError: null,
-    maxQuantity: 10,
   }),
 
   computed: {
     quantities() {
-      return [...Array(this.maxQuantity).keys()].map(i => ({ id: i + 1, name: i + 1 }));
+      return [...Array(MAX_QUANTITY).keys()].map(i => ({ id: i + 1, name: i + 1 }));
     },
   },
 
   methods: {
-    async submit() {
-      this.$v.$touch();
-      this.serverError = null;
-      if (!this.$v.$invalid) {
-        this.buttonState = 'loading';
-        await this.addLineItem()
-          .then(() => {
-            this.buttonState = 'success';
-            this.$store.dispatch('openMiniCart');
-          })
-          .catch((error) => {
-            this.serverError = error;
-            this.buttonState = null;
-          });
-      }
-    },
-
     async addLineItem() {
       if (!this.me.activeCart) {
         await this.createCart();
@@ -111,7 +95,7 @@ export default {
           sku: this.sku,
           quantity: this.quantity,
         },
-      });
+      }).then(() => this.$store.dispatch('openMiniCart'));
     },
 
     createCart() {
@@ -137,8 +121,6 @@ export default {
     },
   },
 
-  mixins: [cartMixin, priceMixin],
-
   apollo: {
     me: {
       query,
@@ -150,7 +132,7 @@ export default {
       quantity: {
         required,
         numeric,
-        between: between(1, this.maxQuantity),
+        between: between(1, MAX_QUANTITY),
       },
     };
   },
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index 4213f5d8..b33ec08e 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="me"
        class="personal-details-edit personal-details-edit-show">
-    <form @submit.prevent="submit"
+    <form @submit.prevent="submit(updateCustomerProfile)"
           id="form-edit-personal-details">
       <ServerError :error="serverError">
         <template slot-scope="{ graphQLError }">
@@ -11,9 +11,9 @@
       <div class="row">
         <div class="col-sm-6">
           <div class="form-sections">
-            <BaseFormField :vuelidate="$v.firstName"
+            <BaseFormField :vuelidate="$v.me.customer.firstName"
                            :label="$t('firstName')">
-              <input v-model.trim.lazy="$v.firstName.$model"
+              <input v-model.trim="$v.me.customer.firstName.$model"
                      autocomplete="fname"
                      type="text"
                      class="form-inputs"
@@ -22,9 +22,9 @@
           </div>
 
           <div class="form-sections">
-            <BaseFormField :vuelidate="$v.email"
+            <BaseFormField :vuelidate="$v.me.customer.email"
                            :label="$t('email')">
-              <input v-model.trim.lazy="$v.email.$model"
+              <input v-model.trim="$v.me.customer.email.$model"
                      autocomplete="email"
                      type="email"
                      class="form-inputs"
@@ -37,9 +37,9 @@
         </div>
         <div class="col-sm-6">
           <div class="form-sections">
-            <BaseFormField :vuelidate="$v.lastName"
+            <BaseFormField :vuelidate="$v.me.customer.lastName"
                            :label="$t('lastName')">
-              <input v-model.trim.lazy="$v.lastName.$model"
+              <input v-model.trim="$v.me.customer.lastName.$model"
                      autocomplete="lname"
                      type="text"
                      class="form-inputs"
@@ -60,6 +60,7 @@
       <div class="personal-details-edit-btn">
         <span>
           <LoadingButton :buttonState="buttonState"
+                         :disabled="!$v.$anyDirty"
                          @reset="$emit('close')"
                          type="submit"
                          class="update-btn"
@@ -81,7 +82,8 @@
 <script>
 import { required, email } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
-import customerMixin from '@/mixins/customerMixin';
+import formMixin from '../../../mixins/formMixin';
+import customerMixin from '../../../mixins/customerMixin';
 import ServerError from '../../common/ServerError.vue';
 import LoadingButton from '../../common/LoadingButton.vue';
 import BaseFormField from '../../common/BaseFormField.vue';
@@ -93,45 +95,18 @@ export default {
     ServerError,
   },
 
+  mixins: [customerMixin, formMixin],
+
   data: () => ({
     me: null,
-    firstName: null,
-    lastName: null,
-    email: null,
-    buttonState: null,
-    serverError: null,
   }),
 
-  computed: {
-    hasFormChanged() {
-      const hasEmailChanged = this.email !== this.me.customer.email;
-      const hasFirstNameChanged = this.firstName !== this.me.customer.firstName;
-      const hasLastNameChanged = this.lastName !== this.me.customer.lastName;
-      return hasEmailChanged || hasFirstNameChanged || hasLastNameChanged;
-    },
-  },
-
   methods: {
-    async submit() {
-      this.$v.$touch();
-      this.serverError = null;
-      if (!this.$v.$invalid && this.hasFormChanged) {
-        this.buttonState = 'loading';
-        await this.updateCustomerProfile()
-          .then(() => {
-            this.buttonState = 'success';
-          }).catch((error) => {
-            this.serverError = error;
-            this.buttonState = null;
-          });
-      }
-    },
-
     updateCustomerProfile() {
       return this.updateMyCustomer([
-        { changeEmail: { email: this.email } },
-        { setFirstName: { firstName: this.firstName } },
-        { setLastName: { lastName: this.lastName } },
+        { changeEmail: { email: this.me.customer.email } },
+        { setFirstName: { firstName: this.me.customer.firstName } },
+        { setLastName: { lastName: this.me.customer.lastName } },
       ]);
     },
 
@@ -143,16 +118,6 @@ export default {
     },
   },
 
-  watch: {
-    me(value) {
-      this.firstName = value.customer.firstName;
-      this.lastName = value.customer.lastName;
-      this.email = value.customer.email;
-    },
-  },
-
-  mixins: [customerMixin],
-
   apollo: {
     me: {
       query: gql`
@@ -172,15 +137,19 @@ export default {
   },
 
   validations: {
-    email: {
-      required,
-      email,
-    },
-    firstName: {
-      required,
-    },
-    lastName: {
-      required,
+    me: {
+      customer: {
+        email: {
+          required,
+          email,
+        },
+        firstName: {
+          required,
+        },
+        lastName: {
+          required,
+        },
+      },
     },
   },
 };
diff --git a/src/mixins/formMixin.js b/src/mixins/formMixin.js
new file mode 100644
index 00000000..03065771
--- /dev/null
+++ b/src/mixins/formMixin.js
@@ -0,0 +1,23 @@
+export default {
+  data: () => ({
+    buttonState: null,
+    serverError: null,
+  }),
+
+  methods: {
+    async submit(onValid) {
+      this.$v.$touch();
+      this.serverError = null;
+      if (!this.$v.$invalid) {
+        this.buttonState = 'loading';
+        await onValid()
+          .then(() => {
+            this.buttonState = 'success';
+          }).catch((error) => {
+            this.serverError = error;
+            this.buttonState = null;
+          });
+      }
+    },
+  },
+};

From 8b4a2e80a62b5a27aff3957a4c7eac96565b4d69 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 5 Jun 2019 10:35:57 +0200
Subject: [PATCH 07/69] Create BaseInput and BaseSelect to abstract form fields

---
 babel.config.js                               |   1 +
 package.json                                  |   1 +
 src/assets/scss/_general.scss                 |   2 +-
 .../cartdetail/LineItemDeleteForm.vue         |  23 +-
 .../cartdetail/LineItemQuantityForm.vue       |  69 ++++--
 src/components/cartdetail/PageCartDetail.vue  |  33 +--
 src/components/checkout/CartOverview.vue      |   1 -
 src/components/common/BaseInput.vue           |  84 +++++++
 src/components/common/BaseSelect.vue          |  87 +++++++
 src/components/common/ValidationError.vue     |  88 +++++++
 src/components/header/LocationSelector.vue    |  10 +-
 src/components/header/MiniCart.vue            |  14 +-
 src/components/login/LoginForm.vue            |  58 +++--
 src/components/login/SignUpForm.vue           | 144 +++++-------
 .../productdetail/AddToCartForm.vue           |  72 ++----
 .../productoverview/ProductSortSelector.vue   |   6 +
 .../userdetail/EditProfileForm.vue            | 219 ++++++++++--------
 .../userdetail/TabPersonalDetails.vue         |  40 +---
 src/main.js                                   |   3 -
 src/mixins/cartMixin.js                       |  55 ++++-
 src/mixins/customerMixin.js                   |  17 +-
 src/mixins/formMixin.js                       |   6 +
 yarn.lock                                     |  20 ++
 23 files changed, 672 insertions(+), 381 deletions(-)
 create mode 100644 src/components/common/BaseInput.vue
 create mode 100644 src/components/common/BaseSelect.vue
 create mode 100644 src/components/common/ValidationError.vue

diff --git a/babel.config.js b/babel.config.js
index 91be2448..e9db6640 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -2,4 +2,5 @@ module.exports = {
   presets: [
     '@vue/app',
   ],
+  plugins: ['@babel/plugin-proposal-optional-chaining'],
 };
diff --git a/package.json b/package.json
index 12391cfb..90d09b8a 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "test:e2e": "vue-cli-service test:e2e"
   },
   "dependencies": {
+    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
     "@commercetools/sdk-auth": "^1.5.0",
     "apollo-cache-inmemory": "^1.3.5",
     "apollo-client": "^2.4.12",
diff --git a/src/assets/scss/_general.scss b/src/assets/scss/_general.scss
index fc4c4d1d..26b2b2be 100755
--- a/src/assets/scss/_general.scss
+++ b/src/assets/scss/_general.scss
@@ -192,7 +192,7 @@ button {
 }
 
 .fade-enter-active, .fade-leave-active {
-  transition: all .5s;
+  transition: all .2s;
 }
 .fade-enter, .fade-leave-to {
   opacity: 0;
diff --git a/src/components/cartdetail/LineItemDeleteForm.vue b/src/components/cartdetail/LineItemDeleteForm.vue
index a0ea3e08..121fb9b9 100644
--- a/src/components/cartdetail/LineItemDeleteForm.vue
+++ b/src/components/cartdetail/LineItemDeleteForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <button @click="submit"
+  <button @click="submit(removeLineItem)"
           data-test="cart-line-item-delete"
           class="edit-delete-section">
     <img src="../../assets/img/delete-1.png"
@@ -10,19 +10,32 @@
 </template>
 
 <script>
+import cartMixin from '../../mixins/cartMixin';
+import formMixin from '../../mixins/formMixin';
+
 export default {
   props: {
-    lineItem: {
-      type: Object,
+    lineItemId: {
+      type: String,
       required: true,
     },
   },
 
+  mixins: [cartMixin, formMixin],
+
   methods: {
-    submit() {
-      this.$emit('submit', this.lineItem.id);
+    removeLineItem() {
+      return this.updateMyCart([
+        {
+          removeLineItem: {
+            lineItemId: this.lineItemId,
+          },
+        },
+      ]);
     },
   },
+
+  validations: {},
 };
 </script>
 
diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
index 38346db4..0066ef34 100644
--- a/src/components/cartdetail/LineItemQuantityForm.vue
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -1,13 +1,14 @@
 <template>
   <div class="quantity-spinner">
-    <span @click="quantity -= 1"
+    <span @click="form.quantity -= 1"
           data-test="cart-line-item-quantity-dec"
           class="change-quantity-button input-number-decrement">–</span>
-    <input v-model.trim.number="$v.quantity.$model"
-           data-test="cart-line-item-quantity"
-           type="text"
-           class="input-number"/>
-    <span @click="quantity += 1"
+    <BaseInput v-model.number="form.quantity"
+               :vuelidate="$v.form.quantity"
+               type="text"
+               class="input-number"
+               data-test="cart-line-item-quantity" />
+    <span @click="form.quantity += 1"
           data-test="cart-line-item-quantity-inc"
           class="change-quantity-button input-number-increment">+</span>
   </div>
@@ -16,46 +17,68 @@
 <script>
 import debounce from 'lodash.debounce';
 import { required, minValue, numeric } from 'vuelidate/lib/validators';
+import BaseInput from '../common/BaseInput.vue';
+import cartMixin from '../../mixins/cartMixin';
+import formMixin from '../../mixins/formMixin';
 
 export default {
+  components: {
+    BaseInput,
+  },
+
+  mixins: [cartMixin, formMixin],
+
   props: {
-    lineItem: {
-      type: Object,
+    lineItemId: {
+      type: String,
+      required: true,
+    },
+    quantity: {
+      type: Number,
       required: true,
     },
   },
 
   data: () => ({
-    quantity: null,
+    form: {
+      quantity: 1,
+    },
   }),
 
   methods: {
-    submit() {
-      this.$emit('submit', this.lineItem.id, this.quantity);
+    changeLineItemQuantity() {
+      return this.updateMyCart([
+        {
+          changeLineItemQuantity: {
+            lineItemId: this.lineItemId,
+            quantity: this.form.quantity,
+          },
+        },
+      ]);
     },
   },
 
   created() {
-    this.quantity = this.lineItem.quantity;
-    this.debouncedSubmit = debounce(this.submit, 500);
+    this.form.quantity = this.quantity;
+    this.debouncedSubmit = debounce(() => this.submit(this.changeLineItemQuantity), 500);
   },
 
   watch: {
-    quantity(newValue, oldValue) {
-      if (oldValue !== null && newValue !== oldValue) {
-        this.$v.$touch();
-        if (!this.$v.$invalid) {
-          this.debouncedSubmit();
+    form: {
+      quantity(newValue, oldValue) {
+        if (oldValue !== null && newValue !== oldValue) {
+          this.$v.$touch();
+          if (!this.$v.$invalid) {
+            this.debouncedSubmit();
+          }
         }
-      }
+      },
     },
   },
 
   validations: {
-    quantity: {
-      required,
-      numeric,
-      minValue: minValue(1),
+    form: {
+      quantity: { required, numeric, minValue: minValue(1) },
     },
   },
 };
diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index 11bd3e73..05b16706 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -24,11 +24,10 @@
           <div class="cart-content">
             <CartLikeSummary :cart-like="me.activeCart">
               <template #quantity-column="{ lineItem }">
-                <LineItemDeleteForm :line-item="lineItem"
-                                    @submit="removeLineItem"
+                <LineItemDeleteForm :lineItemId="lineItem.id"
                                     class="col-sm-5 cart-edit-delete"/>
-                <LineItemQuantityForm :line-item="lineItem"
-                                      @submit="changeLineItemQuantity"
+                <LineItemQuantityForm :lineItemId="lineItem.id"
+                                      :quantity="lineItem.quantity"
                                       class="col-sm-7 clearfix sm-pull-right"/>
               </template>
             </CartLikeSummary>
@@ -81,30 +80,7 @@ export default {
 
   computed: {
     notEmpty() {
-      return this.me && this.me.activeCart && this.me.activeCart.lineItems.length > 0;
-    },
-  },
-
-  methods: {
-    removeLineItem(lineItemId) {
-      return this.updateMyCart([
-        {
-          removeLineItem: {
-            lineItemId,
-          },
-        },
-      ]);
-    },
-
-    changeLineItemQuantity(lineItemId, quantity) {
-      return this.updateMyCart([
-        {
-          changeLineItemQuantity: {
-            lineItemId,
-            quantity,
-          },
-        },
-      ]);
+      return this.me?.activeCart?.lineItems.length > 0;
     },
   },
 
@@ -115,7 +91,6 @@ export default {
           me {
             activeCart {
               id
-              version
               lineItems {
                 id
                 name(locale: $locale)
diff --git a/src/components/checkout/CartOverview.vue b/src/components/checkout/CartOverview.vue
index 88604aef..c1145eb1 100644
--- a/src/components/checkout/CartOverview.vue
+++ b/src/components/checkout/CartOverview.vue
@@ -141,7 +141,6 @@ export default {
 };
 </script>
 
-<!-- eslint-disable max-len -->
 <i18n>
   en:
     itemsTotal: "{n} item in total | {n} items in total"
diff --git a/src/components/common/BaseInput.vue b/src/components/common/BaseInput.vue
new file mode 100644
index 00000000..3799f7fe
--- /dev/null
+++ b/src/components/common/BaseInput.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="form-field">
+    <label v-if="label"
+           class="field-label text-uppercase">
+      {{ label }}
+      <span v-if="required"
+            :title="$t('required')"
+            class="field-required">
+        *
+      </span>
+      <input v-model="model"
+             v-bind="$attrs"
+             :class="{ 'error': vuelidate.$error }"/>
+    </label>
+    <ValidationError :vuelidate="vuelidate"
+                     :customErrors="customErrors"/>
+  </div>
+</template>
+
+<script>
+import ValidationError from './ValidationError.vue';
+
+export default {
+  inheritAttrs: false,
+
+  components: {
+    ValidationError,
+  },
+
+  props: {
+    value: {
+      type: [String, Number, Boolean],
+    },
+    vuelidate: {
+      type: Object,
+      required: true,
+    },
+    label: {
+      type: String,
+    },
+    customErrors: {
+      type: Object,
+    },
+  },
+
+  computed: {
+    model: {
+      get() {
+        return this.value;
+      },
+      set(value) {
+        this.vuelidate.$touch();
+        this.$emit('input', value);
+      },
+    },
+
+    required() {
+      return this.vuelidate.$params.required;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+label {
+  padding-top: 15px;
+}
+
+.error {
+  border-color: rgba(206, 65, 65, 0.6);
+}
+
+.field-required {
+  color: #D54D4D;
+  cursor: default;
+}
+</style>
+
+<i18n>
+en:
+  required: "Required field"
+de:
+  required: "Pflichtfeld"
+</i18n>
diff --git a/src/components/common/BaseSelect.vue b/src/components/common/BaseSelect.vue
new file mode 100644
index 00000000..cc6fb0cb
--- /dev/null
+++ b/src/components/common/BaseSelect.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="form-field">
+    <label v-if="label"
+           class="field-label text-uppercase">
+      {{ label }}
+      <span v-if="required"
+            :title="$t('required')"
+            class="field-required">
+        *
+      </span>
+      <SelectBoxIt :options="options"
+                   v-model="model"
+                   v-bind="$attrs"
+                   :class="{ 'error': vuelidate.$error }"/>
+    </label>
+    <ValidationError :vuelidate="vuelidate"
+                     :customErrors="customErrors"/>
+  </div>
+</template>
+
+<script>
+import ValidationError from './ValidationError.vue';
+import SelectBoxIt from './SelectBoxIt.vue';
+
+export default {
+  inheritAttrs: false,
+
+  components: {
+    SelectBoxIt,
+    ValidationError,
+  },
+
+  props: {
+    value: {
+      type: [String, Number, Boolean],
+    },
+    vuelidate: {
+      type: Object,
+      required: true,
+    },
+    label: {
+      type: String,
+    },
+    customErrors: {
+      type: Object,
+    },
+  },
+
+  computed: {
+    model: {
+      get() {
+        return this.value;
+      },
+      set(value) {
+        this.vuelidate.$touch();
+        this.$emit('input', value);
+      },
+    },
+
+    required() {
+      return this.vuelidate.$params.required;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+label {
+  padding-top: 15px;
+}
+
+.error {
+  border-color: rgba(206, 65, 65, 0.6);
+}
+
+.field-required {
+  color: #D54D4D;
+  cursor: default;
+}
+</style>
+
+<i18n>
+en:
+  required: "Required field"
+de:
+  required: "Pflichtfeld"
+</i18n>
diff --git a/src/components/common/ValidationError.vue b/src/components/common/ValidationError.vue
new file mode 100644
index 00000000..c95ab653
--- /dev/null
+++ b/src/components/common/ValidationError.vue
@@ -0,0 +1,88 @@
+<template>
+  <div v-if="vuelidate.$error"
+       data-test="validation-error-list">
+    <div v-for="validation in validations"
+         :key="validation">
+      <div v-if="!vuelidate[validation]"
+           :validation="validation"
+           data-test="validation-error">
+        <div class="form-error-bubble">
+          {{ getErrorMessage(validation) }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    vuelidate: {
+      type: Object,
+      required: true,
+    },
+    customErrors: {
+      type: Object,
+      default() { return {}; },
+    },
+  },
+
+  computed: {
+    validations() {
+      return Object.keys(this.vuelidate.$params);
+    },
+  },
+
+  methods: {
+    getErrorMessage(validation) {
+      const customError = this.customErrors[validation];
+      if (customError) {
+        return customError;
+      }
+      const { type, ...args } = this.vuelidate.$params[validation];
+      return this.$te(type) ? this.$t(type, args) : this.$t('unknownValidation');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-error-bubble {
+  position: absolute;
+  z-index: 1000;
+  padding: 5px;
+  margin-top: 6px;
+  background: rgb(250, 226, 226);
+  border: 0px solid rgba(136, 136, 136, 0.747);
+  border-radius: 4px;
+  color: rgb(114, 36, 36);
+  box-shadow: 1px 1px 1px rgb(153, 153, 153);
+}
+
+.form-error-bubble:after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 50%;
+  width: 0;
+  height: 0;
+  border: 6px solid transparent;
+  border-bottom-color: rgb(250, 226, 226);
+  border-top: 0;
+  margin-left: -20px;
+  margin-top: -6px;
+}
+</style>
+
+<i18n>
+en:
+  unknownValidation: "Invalid field"
+  required: "Required field"
+  email: "A valid email is required"
+  minLength: "It should contain at least {min} characters"
+de:
+  unknownValidation: "Ungültiger Feldwert"
+  required: "Pflichtfeld"
+  email: "Eine gültige E-Mail ist erforderlich"
+  minLength: "Es sollte mindestens {min} Zeichen enthalten"
+</i18n>
diff --git a/src/components/header/LocationSelector.vue b/src/components/header/LocationSelector.vue
index 839a75d8..0d8fff1c 100644
--- a/src/components/header/LocationSelector.vue
+++ b/src/components/header/LocationSelector.vue
@@ -17,8 +17,8 @@
         <span class="location-dropdown-label">
         {{ $t("main.header.language") }}
         </span>
-        <SelectBoxIt :options="languages"
-                     v-model="$i18n.locale"
+        <SelectBoxIt v-model="$i18n.locale"
+                     :options="languages"
                      id="language"
                      data-test="location-selector-dropdown"
                      class="select location-select"/>
@@ -39,7 +39,13 @@
 </template>
 
 <script>
+import SelectBoxIt from '../common/SelectBoxIt.vue';
+
 export default {
+  components: {
+    SelectBoxIt,
+  },
+
   data: () => ({
     show: false,
     closeTimer: null,
diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue
index 8ff22024..4320acc2 100644
--- a/src/components/header/MiniCart.vue
+++ b/src/components/header/MiniCart.vue
@@ -34,8 +34,7 @@
                       <BaseMoney :money="lineItem.totalPrice"/>
                     </span>
                   </p>
-                  <LineItemDeleteForm :line-item="lineItem"
-                                      @submit="removeLineItem"/>
+                  <LineItemDeleteForm :lineItemId="lineItem.id"/>
                 </div>
               </div>
             </li>
@@ -91,16 +90,6 @@ export default {
   },
 
   methods: {
-    removeLineItem(lineItemId) {
-      return this.updateMyCart([
-        {
-          removeLineItem: {
-            lineItemId,
-          },
-        },
-      ]);
-    },
-
     toggle() {
       this.$store.dispatch('toggleMiniCart');
     },
@@ -129,7 +118,6 @@ export default {
           me {
             activeCart {
               id
-              version
               lineItems {
                 id
                 quantity
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index cc69a146..143902ec 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -12,28 +12,25 @@
     <div class="login-box-description">{{ $t('description') }}</div>
     <div class="login-box-input-wrapper">
       <form @submit.prevent="submit(customerSignMeIn)">
-        <ServerError :error="serverError">
-          <template slot-scope="{ graphQLError }">
-            {{ getErrorMessage(graphQLError) }}
-          </template>
+        <ServerError :error="serverError"
+                     v-slot="{ graphQLError }">
+          {{ getErrorMessage(graphQLError) }}
         </ServerError>
         <div class="login-box-input">
-          <BaseFormField :vuelidate="$v.email"
-                         :label="$t('email')">
-            <input v-model.trim.lazy="$v.email.$model"
-                   autocomplete="username"
-                   type="email"
-                   data-test="login-form-email" />
-          </BaseFormField>
+          <BaseInput v-model="form.email"
+                     :vuelidate="$v.form.email"
+                     :label="$t('email')"
+                     type="email"
+                     autocomplete="username"
+                     data-test="login-form-email" />
         </div>
         <div class="login-box-input">
-          <BaseFormField :vuelidate="$v.password"
-                         :label="$t('password')">
-            <input v-model.trim.lazy="$v.password.$model"
-                   autocomplete="current-password"
-                   type="password"
-                   data-test="login-form-password" />
-          </BaseFormField>
+          <BaseInput v-model="form.password"
+                     :vuelidate="$v.form.password"
+                     :label="$t('password')"
+                     type="password"
+                     autocomplete="current-password"
+                     data-test="login-form-password" />
         </div>
         <div class="clearfix">
           <div class="pull-left">
@@ -68,11 +65,11 @@ import { clientLogin } from '../../auth';
 import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/ServerError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
-import BaseFormField from '../common/BaseFormField.vue';
+import BaseInput from '../common/BaseInput.vue';
 
 export default {
   components: {
-    BaseFormField,
+    BaseInput,
     ServerError,
     LoadingButton,
   },
@@ -80,8 +77,10 @@ export default {
   mixins: [formMixin],
 
   data: () => ({
-    email: '',
-    password: '',
+    form: {
+      email: '',
+      password: '',
+    },
   }),
 
   methods: {
@@ -97,11 +96,11 @@ export default {
           }`,
         variables: {
           draft: {
-            email: this.email,
-            password: this.password,
+            email: this.form.email,
+            password: this.form.password,
           },
         },
-      }).then(() => clientLogin(this.email, this.password))
+      }).then(() => clientLogin(this.form.email, this.form.password))
         .then(() => this.$router.push({ name: 'user' }));
     },
 
@@ -114,12 +113,9 @@ export default {
   },
 
   validations: {
-    email: {
-      required,
-      email,
-    },
-    password: {
-      required,
+    form: {
+      email: { required, email },
+      password: { required },
     },
   },
 };
diff --git a/src/components/login/SignUpForm.vue b/src/components/login/SignUpForm.vue
index a7f894c1..f6b0870e 100644
--- a/src/components/login/SignUpForm.vue
+++ b/src/components/login/SignUpForm.vue
@@ -11,67 +11,61 @@
     <hr class="signup-box-hr">
     <div class="signup-box-description">{{ $t('description') }}</div>
     <form @submit.prevent="submit(customerSignMeUp)">
-      <ServerError :error="serverError">
-        <template slot-scope="{ graphQLError }">
-          {{ getErrorMessage(graphQLError) }}
-        </template>
+      <ServerError :error="serverError"
+                   v-slot="{ graphQLError }">
+        {{ getErrorMessage(graphQLError) }}
       </ServerError>
       <div class="row">
         <div class="col-sm-6">
           <div class="signup-box-input">
-            <BaseFormField :vuelidate="$v.firstName"
-                           :label="$t('firstName')">
-              <input v-model.trim.lazy="$v.firstName.$model"
-                     autocomplete="fname"
-                     type="text"
-                     data-test="signup-form-firstname" />
-            </BaseFormField>
+            <BaseInput v-model="form.firstName"
+                       :vuelidate="$v.form.firstName"
+                       :label="$t('firstName')"
+                       type="text"
+                       autocomplete="fname"
+                       data-test="signup-form-firstname" />
           </div>
         </div>
         <div class="col-sm-6">
           <div class="signup-box-input">
-            <BaseFormField :vuelidate="$v.lastName"
-                           :label="$t('secondName')">
-              <input v-model.trim.lazy="$v.lastName.$model"
-                     autocomplete="lname"
-                     type="text"
-                     data-test="signup-form-lastname" >
-            </BaseFormField>
+            <BaseInput v-model="form.lastName"
+                       :vuelidate="$v.form.lastName"
+                       :label="$t('secondName')"
+                       type="text"
+                       autocomplete="lname"
+                       data-test="signup-form-lastname" />
           </div>
         </div>
       </div>
       <hr class="signup-box-hr">
       <div class="signup-box-input">
-        <BaseFormField :vuelidate="$v.email"
-                       :label="$t('email')">
-          <input v-model.trim.lazy="$v.email.$model"
-                 autocomplete="username"
-                 type="email"
-                 data-test="signup-form-email" />
-        </BaseFormField>
+        <BaseInput v-model="form.email"
+                   :vuelidate="$v.form.email"
+                   :label="$t('email')"
+                   type="email"
+                   autocomplete="username"
+                   data-test="signup-form-email" />
       </div>
       <div class="row">
         <div class="col-sm-6">
           <div class="signup-box-input">
-            <BaseFormField :vuelidate="$v.password"
-                           :label="$t('password')">
-              <input v-model.trim.lazy="$v.password.$model"
-                     autocomplete="off"
-                     type="password"
-                     data-test="signup-form-password" />
-            </BaseFormField>
+            <BaseInput v-model="form.password"
+                       :vuelidate="$v.form.password"
+                       :label="$t('password')"
+                       type="password"
+                       autocomplete="off"
+                       data-test="signup-form-password" />
           </div>
         </div>
         <div class="col-sm-6">
           <div class="signup-box-input">
-            <BaseFormField :vuelidate="$v.repeatPassword"
-                           :label="$t('repeatPassword')"
-                           :customMessages="{ sameAsPassword: $t('repeatPasswordError') }">
-              <input v-model.trim.lazy="$v.repeatPassword.$model"
-                     autocomplete="off"
-                     type="password"
-                     data-test="signup-form-repeatpassword" />
-            </BaseFormField>
+            <BaseInput v-model="form.repeatPassword"
+                       :vuelidate="$v.form.repeatPassword"
+                       :label="$t('repeatPassword')"
+                       :customErrors="{ sameAsPassword: $t('repeatPasswordError') }"
+                       type="password"
+                       autocomplete="off"
+                       data-test="signup-form-repeatpassword" />
           </div>
         </div>
       </div>
@@ -82,14 +76,13 @@
         <!--<span>{{ $t('pleaseAddMe') }} <a href="">{{ $t('newsletter') }}</a></span>-->
       <!--</div>-->
       <div class="signup-box-terms">
-        <BaseFormField :vuelidate="$v.agreeToTerms"
-                       :label="$t('agreeTo')"
-                       :customMessages="{ mustBeAgreed: $t('agreeToTermsError') }">
-          <input v-model.trim.lazy="$v.agreeToTerms.$model"
-                 autocomplete="off"
-                 type="checkbox"
-                 data-test="signup-form-agreetoterms" />
-        </BaseFormField>
+        <BaseInput v-model="form.agreeToTerms"
+                   :vuelidate="$v.form.agreeToTerms"
+                   :label="$t('agreeTo')"
+                   :customErrors="{ mustBeAgreed: $t('agreeToTermsError') }"
+                   type="checkbox"
+                   autocomplete="off"
+                   data-test="signup-form-agreetoterms" />
       </div>
       <LoadingButton :buttonState="buttonState"
                      class="signup-register-btn"
@@ -109,11 +102,11 @@ import { clientLogin } from '../../auth';
 import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/ServerError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
-import BaseFormField from '../common/BaseFormField.vue';
+import BaseInput from '../common/BaseInput.vue';
 
 export default {
   components: {
-    BaseFormField,
+    BaseInput,
     ServerError,
     LoadingButton,
   },
@@ -121,12 +114,14 @@ export default {
   mixins: [formMixin],
 
   data: () => ({
-    firstName: '',
-    lastName: '',
-    email: '',
-    password: '',
-    repeatPassword: '',
-    agreeToTerms: false,
+    form: {
+      firstName: '',
+      lastName: '',
+      email: '',
+      password: '',
+      repeatPassword: '',
+      agreeToTerms: false,
+    },
   }),
 
   methods: {
@@ -142,13 +137,13 @@ export default {
           }`,
         variables: {
           draft: {
-            email: this.email,
-            password: this.password,
-            firstName: this.firstName,
-            lastName: this.lastName,
+            email: this.form.email,
+            password: this.form.password,
+            firstName: this.form.firstName,
+            lastName: this.form.lastName,
           },
         },
-      }).then(() => clientLogin(this.email, this.password))
+      }).then(() => clientLogin(this.form.email, this.form.password))
         .then(() => this.$router.push({ name: 'user' }));
     },
 
@@ -161,26 +156,13 @@ export default {
   },
 
   validations: {
-    firstName: {
-      required,
-    },
-    lastName: {
-      required,
-    },
-    email: {
-      required,
-      email,
-    },
-    password: {
-      required,
-      minLength: minLength(5),
-    },
-    repeatPassword: {
-      sameAsPassword: sameAs('password'),
-    },
-    agreeToTerms: {
-      required,
-      mustBeAgreed: sameAs(() => true),
+    form: {
+      firstName: { required },
+      lastName: { required },
+      email: { required, email },
+      password: { required, minLength: minLength(5) },
+      repeatPassword: { sameAsPassword: sameAs('password') },
+      agreeToTerms: { required, mustBeAgreed: sameAs(() => true) },
     },
   },
 };
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index 7463684e..6d3f5f49 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -15,12 +15,11 @@
     <div class="row">
       <ul class="product-actions-list list-inline">
         <li class="bag-items-li">
-          <BaseFormField :vuelidate="$v.quantity">
-            <SelectBoxIt :options="quantities"
-                         v-model.lazy.number="$v.quantity.$model"
-                         data-test="add-to-cart-form-quantity-dropdown"
-                         class="bag-items"/>
-          </BaseFormField>
+          <BaseSelect v-model.number="form.quantity"
+                      :vuelidate="$v.form.quantity"
+                      :options="quantities"
+                      data-test="add-to-cart-form-quantity-dropdown"
+                      class="bag-items"/>
         </li>
         <li>
           <LoadingButton :buttonState="buttonState"
@@ -38,25 +37,15 @@
 </template>
 
 <script>
-import gql from 'graphql-tag';
 import { required, numeric, between } from 'vuelidate/lib/validators';
 import cartMixin from '../../mixins/cartMixin';
 import priceMixin from '../../mixins/priceMixin';
 import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/ServerError.vue';
 import LoadingButton from '../common/LoadingButton.vue';
-import BaseFormField from '../common/BaseFormField.vue';
+import BaseSelect from '../common/BaseSelect.vue';
 
 const MAX_QUANTITY = 10;
-const query = gql`
-  query me {
-    me {
-      activeCart {
-        id
-        version
-      }
-    }
-  }`;
 
 export default {
   props: {
@@ -67,7 +56,7 @@ export default {
   },
 
   components: {
-    BaseFormField,
+    BaseSelect,
     LoadingButton,
     ServerError,
   },
@@ -75,8 +64,9 @@ export default {
   mixins: [cartMixin, priceMixin, formMixin],
 
   data: () => ({
-    me: null,
-    quantity: 1,
+    form: {
+      quantity: 1,
+    },
   }),
 
   computed: {
@@ -88,52 +78,24 @@ export default {
   methods: {
     async addLineItem() {
       if (!this.me.activeCart) {
-        await this.createCart();
+        await this.createMyCart({
+          draft: {
+            currency: this.currency,
+          },
+        });
       }
       return this.updateMyCart({
         addLineItem: {
           sku: this.sku,
-          quantity: this.quantity,
+          quantity: this.form.quantity,
         },
       }).then(() => this.$store.dispatch('openMiniCart'));
     },
-
-    createCart() {
-      return this.$apollo.mutate({
-        mutation: gql`
-          mutation createMyCart($draft: MyCartDraft!) {
-            createMyCart(draft: $draft) {
-              id
-              version
-            }
-          }`,
-        variables: {
-          draft: {
-            currency: this.currency,
-          },
-        },
-        update: (store, { data: { createMyCart } }) => {
-          const data = store.readQuery({ query });
-          data.me.activeCart = createMyCart;
-          store.writeQuery({ query, data });
-        },
-      });
-    },
-  },
-
-  apollo: {
-    me: {
-      query,
-    },
   },
 
   validations() {
     return {
-      quantity: {
-        required,
-        numeric,
-        between: between(1, MAX_QUANTITY),
-      },
+      quantity: { required, numeric, between: between(1, MAX_QUANTITY) },
     };
   },
 };
diff --git a/src/components/productoverview/ProductSortSelector.vue b/src/components/productoverview/ProductSortSelector.vue
index 4ff80ae5..f2eb9a7a 100644
--- a/src/components/productoverview/ProductSortSelector.vue
+++ b/src/components/productoverview/ProductSortSelector.vue
@@ -9,7 +9,13 @@
 </template>
 
 <script>
+import SelectBoxIt from '../common/SelectBoxIt.vue';
+
 export default {
+  components: {
+    SelectBoxIt,
+  },
+
   data: () => ({
     sort: null,
   }),
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index b33ec08e..f2967541 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -1,81 +1,108 @@
 <template>
-  <div v-if="me"
-       class="personal-details-edit personal-details-edit-show">
-    <form @submit.prevent="submit(updateCustomerProfile)"
-          id="form-edit-personal-details">
-      <ServerError :error="serverError">
-        <template slot-scope="{ graphQLError }">
-          {{ getErrorMessage(graphQLError) }}
-        </template>
-      </ServerError>
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="form-sections">
-            <BaseFormField :vuelidate="$v.me.customer.firstName"
-                           :label="$t('firstName')">
-              <input v-model.trim="$v.me.customer.firstName.$model"
-                     autocomplete="fname"
-                     type="text"
-                     class="form-inputs"
-                     data-test="edit-profile-form-firstname"/>
-            </BaseFormField>
+  <div v-if="me">
+    <div class="personal-details-title">
+      <span>{{ $t('title') }}</span>
+      <span v-if="showForm"
+            class="pull-right required-text personal-details-edit-show">
+        {{ $t('main.form.required') }}
+      </span>
+    </div>
+    <div class="personal-details-edit personal-details-edit-show">
+      <transition name="fade"
+                  mode="out-in">
+        <form v-if="showForm"
+              @submit.prevent="submit(updateCustomerProfile)"
+              id="form-edit-personal-details">
+          <ServerError :error="serverError"
+                       v-slot="{ graphQLError }">
+              {{ getErrorMessage(graphQLError) }}
+          </ServerError>
+          <div class="row">
+            <div class="col-sm-6">
+              <div class="form-sections">
+                <BaseInput v-model="form.firstName"
+                           :vuelidate="$v.form.firstName"
+                           :label="$t('firstName')"
+                           type="text"
+                           autocomplete="fname"
+                           class="form-inputs"
+                           data-test="edit-profile-form-firstname"/>
+              </div>
+              <div class="form-sections">
+                <BaseInput v-model="form.email"
+                           :vuelidate="$v.form.email"
+                           :label="$t('email')"
+                           type="email"
+                           autocomplete="email"
+                           class="form-inputs"
+                           data-test="edit-profile-form-email"/>
+                <br>
+                <span class="form-notes"></span>
+              </div>
+            </div>
+            <div class="col-sm-6">
+              <div class="form-sections">
+                <BaseInput v-model="form.lastName"
+                           :vuelidate="$v.form.lastName"
+                           :label="$t('lastName')"
+                           type="text"
+                           autocomplete="lname"
+                           class="form-inputs"
+                           data-test="edit-profile-form-lastname"/>
+              </div>
+            </div>
           </div>
-
-          <div class="form-sections">
-            <BaseFormField :vuelidate="$v.me.customer.email"
-                           :label="$t('email')">
-              <input v-model.trim="$v.me.customer.email.$model"
-                     autocomplete="email"
-                     type="email"
-                     class="form-inputs"
-                     data-test="edit-profile-form-email"/>
-            </BaseFormField>
-            <br>
-            <span class="form-notes"></span>
+          <hr class="light-grey-hr">
+          <!-- <div class="personal-details-newsletter"> -->
+            <!-- <span> -->
+              <!-- <input name="subscribeToNewsletter" -->
+                      <!-- type="checkbox" -->
+                      <!-- {{#if personalDetails.personalDetailsForm.subscribeToNewsletter}}checked{{/if}}/> -->
+              <!-- {{ $t('personalDetailsForm.subscribeToNewsletter') }} -->
+            <!-- </span> -->
+          <!-- </div> -->
+          <div class="personal-details-edit-btn">
+            <span>
+              <LoadingButton :buttonState="buttonState"
+                             :disabled="formIsClean"
+                             @reset="closeForm"
+                             type="submit"
+                             class="update-btn"
+                             data-test="edit-profile-form-submit">
+                {{ $t('updateBtn') }}
+              </LoadingButton>
+              <button @click="closeForm"
+                      type="button"
+                      class="cancel-btn personal-details-edit-hide-btn"
+                      data-test="edit-profile-form-cancel">
+                {{ $t('cancelBtn') }}
+              </button>
+            </span>
           </div>
-
-        </div>
-        <div class="col-sm-6">
-          <div class="form-sections">
-            <BaseFormField :vuelidate="$v.me.customer.lastName"
-                           :label="$t('lastName')">
-              <input v-model.trim="$v.me.customer.lastName.$model"
-                     autocomplete="lname"
-                     type="text"
-                     class="form-inputs"
-                     data-test="edit-profile-form-lastname"/>
-            </BaseFormField>
+        </form>
+        <div v-else
+             class="personal-details-edit-hide">
+          <div class="personal-details-box">
+            <div>
+              <span data-test="user-profile-name">{{ me.customer.firstName }} {{ me.customer.lastName }}</span>
+            </div>
+            <div data-test="user-profile-email">{{ me.customer.email }}</div>
+            <br>
+            <!--{{#if content.customerInfo.subscribed}}-->
+            <!--<div>{{ $t('subscribedToNewsletter') }}</div>-->
+            <!--{{/if}}-->
+            <div class="personal-details-box-edit">
+              <button @click="openForm"
+                      class="personal-details-edit-show-btn"
+                      data-test="edit-profile-form-show">
+                <img src="../../../assets/img/edit-1.png" alt="edit icon">
+                {{ $t('editBtn') }}
+              </button>
+            </div>
           </div>
         </div>
-      </div>
-      <hr class="light-grey-hr">
-      <!-- <div class="personal-details-newsletter"> -->
-        <!-- <span> -->
-          <!-- <input name="subscribeToNewsletter" -->
-                  <!-- type="checkbox" -->
-                  <!-- {{#if personalDetails.personalDetailsForm.subscribeToNewsletter}}checked{{/if}}/> -->
-          <!-- {{ $t('personalDetailsForm.subscribeToNewsletter') }} -->
-        <!-- </span> -->
-      <!-- </div> -->
-      <div class="personal-details-edit-btn">
-        <span>
-          <LoadingButton :buttonState="buttonState"
-                         :disabled="!$v.$anyDirty"
-                         @reset="$emit('close')"
-                         type="submit"
-                         class="update-btn"
-                         data-test="edit-profile-form-submit">
-            {{ $t('updateBtn') }}
-          </LoadingButton>
-          <button @click="$emit('close')"
-                  type="button"
-                  class="cancel-btn personal-details-edit-hide-btn"
-                  data-test="edit-profile-form-cancel">
-            {{ $t('cancelBtn') }}
-          </button>
-        </span>
-      </div>
-    </form>
+      </transition>
+    </div>
   </div>
 </template>
 
@@ -86,11 +113,11 @@ import formMixin from '../../../mixins/formMixin';
 import customerMixin from '../../../mixins/customerMixin';
 import ServerError from '../../common/ServerError.vue';
 import LoadingButton from '../../common/LoadingButton.vue';
-import BaseFormField from '../../common/BaseFormField.vue';
+import BaseInput from '../../common/BaseInput.vue';
 
 export default {
   components: {
-    BaseFormField,
+    BaseInput,
     LoadingButton,
     ServerError,
   },
@@ -99,14 +126,16 @@ export default {
 
   data: () => ({
     me: null,
+    form: {},
+    showForm: false,
   }),
 
   methods: {
     updateCustomerProfile() {
       return this.updateMyCustomer([
-        { changeEmail: { email: this.me.customer.email } },
-        { setFirstName: { firstName: this.me.customer.firstName } },
-        { setLastName: { lastName: this.me.customer.lastName } },
+        { changeEmail: { email: this.form.email } },
+        { setFirstName: { firstName: this.form.firstName } },
+        { setLastName: { lastName: this.form.lastName } },
       ]);
     },
 
@@ -116,6 +145,21 @@ export default {
       }
       return this.$t('unknownError');
     },
+
+    openForm() {
+      this.showForm = true;
+    },
+
+    closeForm() {
+      this.showForm = false;
+      this.$v.$reset();
+    },
+  },
+
+  watch: {
+    me(value) {
+      this.form = { ...value.customer };
+    },
   },
 
   apollo: {
@@ -137,19 +181,10 @@ export default {
   },
 
   validations: {
-    me: {
-      customer: {
-        email: {
-          required,
-          email,
-        },
-        firstName: {
-          required,
-        },
-        lastName: {
-          required,
-        },
-      },
+    form: {
+      email: { required, email },
+      firstName: { required },
+      lastName: { required },
     },
   },
 };
@@ -158,6 +193,7 @@ export default {
 <i18n>
 en:
   title: "Your Personal Details"
+  editBtn: "Edit"
   updateBtn: "Update Details"
   cancelBtn: "Cancel"
   firstName: "First Name"
@@ -167,6 +203,7 @@ en:
   duplicatedEmail: "A customer with this email already exists"
 de:
   title: "Ihre Benutzerdaten"
+  editBtn: "Bearbeiten"
   updateBtn: "Details aktualisieren"
   cancelBtn: "Abbrechen"
   firstName: "Vorname"
diff --git a/src/components/useraccount/userdetail/TabPersonalDetails.vue b/src/components/useraccount/userdetail/TabPersonalDetails.vue
index 9afe8be2..a086ca28 100644
--- a/src/components/useraccount/userdetail/TabPersonalDetails.vue
+++ b/src/components/useraccount/userdetail/TabPersonalDetails.vue
@@ -10,39 +10,7 @@
         <br>
         <span class="customer-number">{{ me.customer.customerNumber }}</span>
       </div>
-      <div class="personal-details-title">
-        <span>{{ $t('title') }}</span>
-        <span v-if="showEditForm"
-              class="pull-right required-text personal-details-edit-show">
-          {{ $t('main.form.required') }}
-        </span>
-      </div>
-      <transition name="fade"
-                  mode="out-in">
-        <EditProfileForm v-if="showEditForm"
-                         @close="showEditForm = false"/>
-        <div v-else
-             class="personal-details-edit-hide">
-          <div class="personal-details-box">
-            <div>
-              <span data-test="user-profile-name">{{ me.customer.firstName }} {{ me.customer.lastName}}</span>
-            </div>
-            <div data-test="user-profile-email">{{ me.customer.email }}</div>
-            <br>
-            <!--{{#if content.customerInfo.subscribed}}-->
-            <!--<div>{{ $t('subscribedToNewsletter') }}</div>-->
-            <!--{{/if}}-->
-            <div class="personal-details-box-edit">
-              <button @click="showEditForm = true"
-                      class="personal-details-edit-show-btn"
-                      data-test="edit-profile-form-show">
-                <img src="../../../assets/img/edit-1.png" alt="edit icon">
-                {{ $t('main.form.edit') }}
-              </button>
-            </div>
-          </div>
-        </div>
-      </transition>
+      <EditProfileForm />
     </div>
     <div class="col-sm-3">
       <div class="my-account-banners">
@@ -82,9 +50,9 @@ import EditProfileForm from './EditProfileForm.vue';
 
 export default {
   components: { EditProfileForm },
+
   data: () => ({
     me: null,
-    showEditForm: false,
   }),
 
   apollo: {
@@ -94,9 +62,7 @@ export default {
           me {
             customer {
               id
-              email
               firstName
-              lastName
               customerNumber
             }
           }
@@ -109,7 +75,6 @@ export default {
 
 <i18n>
 en:
-  title: "Your Personal Details"
   welcomeBack: "Welcome back, {name}"
   welcomeDescription: "for an even better customer service please provide your customer number"
   subscribedToNewsletter: "Subscribed to weekly newsletter"
@@ -122,7 +87,6 @@ en:
     subtitle: "Make the great days happen"
     link: "Shop All"
 de:
-  title: "Ihre Benutzerdaten"
   welcomeBack: "Willkommen zurück, {name}"
   welcomeDescription: "Für einen besseren Kundenservice geben Sie bitte Ihre Kundennummer an."
   subscribedToNewsletter: "Subscribed to weekly newsletter"
diff --git a/src/main.js b/src/main.js
index 672e6dd4..17fc9671 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,5 @@
 import Vue from 'vue';
 import App from '@/App.vue';
-import SelectBoxIt from '@/components/common/SelectBoxIt.vue';
 import Vuelidate from 'vuelidate';
 import router from '@/router';
 import store from '@/store';
@@ -17,8 +16,6 @@ Vue.config.productionTip = false;
 Vue.use(ProductZoomer);
 Vue.use(Vuelidate);
 
-Vue.component('SelectBoxIt', SelectBoxIt);
-
 Vue.prototype.$sunrise = sunriseConfig;
 
 new Vue({
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index f3e13369..7b748f8a 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -4,14 +4,14 @@ import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
 export default {
   computed: {
     totalItems() {
-      if (this.me && this.me.activeCart) {
+      if (this.me?.activeCart) {
         return this.me.activeCart.lineItems.reduce((acc, li) => acc + li.quantity, 0);
       }
       return 0;
     },
 
     sortedLineItems() {
-      if (this.me && this.me.activeCart) {
+      if (this.me?.activeCart) {
         return [...this.me.activeCart.lineItems].reverse();
       }
       return [];
@@ -19,10 +19,9 @@ export default {
   },
 
   methods: {
-    // Issue with under-fetching on mutations https://github.com/apollographql/apollo-client/issues/3267
-    // required any queried field to be fetched in order to update all components using carts, e.g. mini-cart
-
     updateMyCart(actions) {
+      // Issue with under-fetching on mutations https://github.com/apollographql/apollo-client/issues/3267
+      // required any queried field to be fetched in order to update all components using carts, e.g. mini-cart
       return this.$apollo.mutate({
         mutation: gql`
           mutation updateMyCart(
@@ -79,11 +78,53 @@ export default {
           ${DisplayableMoneyFragment}`,
         variables: {
           actions,
-          id: this.me.activeCart.id,
-          version: this.me.activeCart.version,
+          id: this.me?.activeCart?.id,
+          version: this.me?.activeCart?.version,
           locale: this.$i18n.locale,
         },
       });
     },
+
+    createMyCart(draft) {
+      return this.$apollo.mutate({
+        mutation: gql`
+          mutation createMyCart($draft: MyCartDraft!) {
+            createMyCart(draft: $draft) {
+              id
+              version
+            }
+          }`,
+        variables: { draft },
+        update: (store, { data: { createMyCart } }) => {
+          const query = gql`
+            query me {
+              me {
+                activeCart {
+                  id
+                  version
+                }
+              }
+            }`;
+          const data = store.readQuery({ query });
+          data.me.activeCart = createMyCart;
+          store.writeQuery({ query, data });
+        },
+      });
+    },
+  },
+
+  apollo: {
+    me: {
+      query: gql`
+        query me {
+          me {
+            activeCart {
+              id
+              version
+            }
+          }
+        }`,
+      skip: vm => !vm.$store.state.authenticated,
+    },
   },
 };
diff --git a/src/mixins/customerMixin.js b/src/mixins/customerMixin.js
index fa4fa23f..23d3afc5 100644
--- a/src/mixins/customerMixin.js
+++ b/src/mixins/customerMixin.js
@@ -15,10 +15,25 @@ export default {
             }
           }`,
         variables: {
-          version: this.me.customer.version,
+          version: this.me?.customer?.version,
           actions,
         },
       });
     },
   },
+
+  apollo: {
+    me: {
+      query: gql`
+        query me {
+          me {
+            customer {
+              id
+              version
+            }
+          }
+        }`,
+      skip: vm => !vm.$store.state.authenticated,
+    },
+  },
 };
diff --git a/src/mixins/formMixin.js b/src/mixins/formMixin.js
index 03065771..200dfe27 100644
--- a/src/mixins/formMixin.js
+++ b/src/mixins/formMixin.js
@@ -4,6 +4,12 @@ export default {
     serverError: null,
   }),
 
+  computed: {
+    formIsClean() {
+      return !this.$v.$anyDirty;
+    },
+  },
+
   methods: {
     async submit(onValid) {
       this.$v.$touch();
diff --git a/yarn.lock b/yarn.lock
index cf93c701..47d3c9bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -292,6 +292,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
+"@babel/plugin-proposal-optional-chaining@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz#ae454f4c21c6c2ce8cb2397dc332ae8b420c5441"
+  integrity sha512-ea3Q6edZC/55wEBVZAEz42v528VulyO0eir+7uky/sT4XRcdkWJcFi1aPtitTlwUzGnECWJNExWww1SStt+yWw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.2.0"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
@@ -350,6 +358,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-optional-chaining@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz#a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff"
+  integrity sha512-HtGCtvp5Uq/jH/WNUPkK6b7rufnCPLLlDAFN7cmACoIjaOOiXxUt3SswU5loHqrhtqTsa/WoLQ1OQ1AGuZqaWA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-arrow-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
@@ -7956,6 +7971,11 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"

From 45ca1c274012dd91a24cb422400c29ceefc3811f Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 5 Jun 2019 17:32:16 +0200
Subject: [PATCH 08/69] Fix input and label styles and functionality

---
 public/manifest.json                          |  12 -
 src/assets/scss/_cart.scss                    |  10 +-
 .../scss/_my-account-personal-details.scss    |   2 +-
 src/assets/scss/_pdp.scss                     |   8 +-
 .../cartdetail/LineItemDeleteForm.vue         |   7 +-
 .../cartdetail/LineItemQuantityForm.vue       |  14 +-
 src/components/checkout/BaseAddressForm.vue   | 170 --------------
 src/components/checkout/PageCheckout.vue      |   2 -
 src/components/checkout/StepAddressForm.vue   |  22 +-
 .../checkout/StepShippingAddressForm.vue      | 212 ++++++++++++++++++
 src/components/common/BaseFormField.vue       | 121 ----------
 src/components/common/BaseInput.vue           |  48 ++--
 src/components/common/BaseLabel.vue           |  55 +++++
 src/components/common/BaseSelect.vue          |  52 ++---
 src/components/login/LoginForm.vue            |   3 -
 src/components/login/SignUpForm.vue           |   5 -
 .../productdetail/AddToCartForm.vue           |   4 +-
 .../userdetail/EditProfileForm.vue            |   4 -
 src/router.js                                 |   2 +-
 19 files changed, 322 insertions(+), 431 deletions(-)
 delete mode 100644 src/components/checkout/BaseAddressForm.vue
 create mode 100644 src/components/checkout/StepShippingAddressForm.vue
 delete mode 100644 src/components/common/BaseFormField.vue
 create mode 100644 src/components/common/BaseLabel.vue

diff --git a/public/manifest.json b/public/manifest.json
index af23b44e..a9e0b8cb 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,18 +1,6 @@
 {
   "name": "sunrise",
   "short_name": "sunrise",
-  "icons": [
-    {
-      "src": "/img/icons/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "/img/icons/android-chrome-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ],
   "start_url": "/index.html",
   "display": "standalone",
   "background_color": "#000000",
diff --git a/src/assets/scss/_cart.scss b/src/assets/scss/_cart.scss
index 8d2aa21d..2ca1541a 100755
--- a/src/assets/scss/_cart.scss
+++ b/src/assets/scss/_cart.scss
@@ -135,14 +135,14 @@
 }
 
 // Quantity counter / spinner
-.input-number {
+.input-number input {
   width: 40px;
   padding: 0 10px;
   vertical-align: top;
   text-align: center;
   outline: none;
 }
-.input-number,
+.input-number input,
 .input-number-decrement,
 .input-number-increment {
   border: 1px solid $alto;
@@ -278,7 +278,7 @@
   .cart-attributes {
     font-size: 0.9em;
   }
-  .input-number {
+  .input-number input {
     padding: 0;
     width: 22px;
   }
@@ -329,7 +329,7 @@
   .quantity-spinner {
     text-align: right;
   }
-  .input-number {
+  .input-number input {
     padding: 0 0.2em;
     width: 30px;
   }
@@ -366,7 +366,7 @@
   .sm-pull-right {
     float: right;
     .quantity-spinner {
-      .input-number {
+      .input-number input {
         margin: 0 3px;
       }
     }
diff --git a/src/assets/scss/_my-account-personal-details.scss b/src/assets/scss/_my-account-personal-details.scss
index 6a26ee62..dc759ecd 100644
--- a/src/assets/scss/_my-account-personal-details.scss
+++ b/src/assets/scss/_my-account-personal-details.scss
@@ -163,7 +163,7 @@
   text-transform: uppercase;
   font-size: 12px;
 }
-.form-inputs {
+.form-inputs input {
   width: 100%;
   border: 1px solid #D6D6D6;
   border-radius: 1px;
diff --git a/src/assets/scss/_pdp.scss b/src/assets/scss/_pdp.scss
index 1da9ec77..b1fca7ee 100755
--- a/src/assets/scss/_pdp.scss
+++ b/src/assets/scss/_pdp.scss
@@ -143,7 +143,7 @@
     margin: 0px 0px 15px 0px;
     vertical-align: top;
 
-    .bag-items {
+    .bag-items select, .bag-items .selectboxit {
       height: 43px;
       line-height: 43px;
     }
@@ -151,15 +151,15 @@
 }
 
 // Number of bag items
-.bag-items {
+.bag-items select, .bag-items .selectboxit {
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
   background: transparent url("../img/arrow-67-filled.png") no-repeat 80% 50%;
   background-size: 12px;
   color: $gray;
-  padding: 10px 30px 10px 10px;
-  margin: 0 10px 0 0;
+  /* padding: 10px 30px 10px 10px; */
+  /* margin: 0 10px 0 0; */
   border-radius: 0;
   border: 2px solid $my-sin;
 }
diff --git a/src/components/cartdetail/LineItemDeleteForm.vue b/src/components/cartdetail/LineItemDeleteForm.vue
index 121fb9b9..95c4e379 100644
--- a/src/components/cartdetail/LineItemDeleteForm.vue
+++ b/src/components/cartdetail/LineItemDeleteForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <button @click="submit(removeLineItem)"
+  <button @click="removeLineItem"
           data-test="cart-line-item-delete"
           class="edit-delete-section">
     <img src="../../assets/img/delete-1.png"
@@ -11,7 +11,6 @@
 
 <script>
 import cartMixin from '../../mixins/cartMixin';
-import formMixin from '../../mixins/formMixin';
 
 export default {
   props: {
@@ -21,7 +20,7 @@ export default {
     },
   },
 
-  mixins: [cartMixin, formMixin],
+  mixins: [cartMixin],
 
   methods: {
     removeLineItem() {
@@ -34,8 +33,6 @@ export default {
       ]);
     },
   },
-
-  validations: {},
 };
 </script>
 
diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
index 0066ef34..b2fec3d8 100644
--- a/src/components/cartdetail/LineItemQuantityForm.vue
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -64,15 +64,13 @@ export default {
   },
 
   watch: {
-    form: {
-      quantity(newValue, oldValue) {
-        if (oldValue !== null && newValue !== oldValue) {
-          this.$v.$touch();
-          if (!this.$v.$invalid) {
-            this.debouncedSubmit();
-          }
+    'form.quantity': function triggerDebouncedSubmit(newValue, oldValue) {
+      if (oldValue !== null && newValue !== oldValue) {
+        this.$v.$touch();
+        if (!this.$v.$invalid) {
+          this.debouncedSubmit();
         }
-      },
+      }
     },
   },
 
diff --git a/src/components/checkout/BaseAddressForm.vue b/src/components/checkout/BaseAddressForm.vue
deleted file mode 100644
index 4f343885..00000000
--- a/src/components/checkout/BaseAddressForm.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-  <div class="address-form">
-    <div class="row">
-      <div class="col-sm-6">
-        <BaseFormField :vuelidate="$v.firstName"
-                       :label="$t('firstName')">
-          <input v-model.trim.lazy="$v.firstName.$model"
-                 autocomplete="fname"
-                 type="text"
-                 class="checkout-input-field"/>
-        </BaseFormField>
-      </div>
-      <div class="col-sm-6">
-        <BaseFormField :vuelidate="$v.lastName"
-                       :label="$t('lastName')">
-          <input v-model.trim.lazy="$v.lastName.$model"
-                 autocomplete="lname"
-                 type="text"
-                 class="checkout-input-field"/>
-        </BaseFormField>
-      </div>
-      <div class="col-sm-12">
-        <BaseFormField :vuelidate="$v.streetName"
-                       :label="$t('streetName')">
-          <input v-model.trim.lazy="$v.streetName.$model"
-                 autocomplete="shipping street-address"
-                 type="text"
-                 class="checkout-input-field"/>
-        </BaseFormField>
-      </div>
-      <div class="col-sm-12">
-        <BaseFormField :vuelidate="$v.additionalStreetInfo"
-                       :label="$t('additionalStreetInfo')">
-          <input v-model.trim.lazy="$v.additionalStreetInfo.$model"
-                 type="text"
-                 class="checkout-input-field"/>
-        </BaseFormField>
-      </div>
-      <div class="col-sm-4">
-        <BaseFormField :vuelidate="$v.city"
-                       :label="$t('city')">
-          <input v-model.trim.lazy="$v.city.$model"
-                 autocomplete="shipping locality"
-                 type="text"
-                 class="checkout-input-field"/>
-        </BaseFormField>
-      </div>
-      <div class="col-sm-3">
-        <BaseFormField :vuelidate="$v.postalCode"
-                       :label="$t('postalCode')">
-          <input v-model.trim.lazy="$v.postalCode.$model"
-                 autocomplete="shipping postal-code"
-                 type="text"
-                 class="checkout-input-field"/>
-        </BaseFormField>
-      </div>
-      <div class="col-sm-5">
-        <BaseFormField :vuelidate="$v.country"
-                       :label="$t('country')">
-
-        <!--<div class="country input-block">-->
-          <select v-model.lazy="$v.country.$model"
-                  class="checkout-dropdown">
-            <!--{{#each options.list}}-->
-            <!--<option value="{{value}}" {{#if selected}}selected{{/if}}>{{label}}</option>-->
-            <!--{{/each}}-->
-          </select>
-        </BaseFormField>
-      </div>
-    </div>
-    <hr>
-    <div class="row">
-      <div class="col-sm-6">
-        <BaseFormField :vuelidate="$v.phone"
-                       :label="$t('phone')">
-          <input v-model.trim.lazy="$v.phone.$model"
-                 autocomplete="tel"
-                 type="text"
-                 class="checkout-input-field"/>
-        </BaseFormField>
-      </div>
-      <div class="col-sm-6">
-        <BaseFormField :vuelidate="$v.email"
-                       :label="$t('email')">
-          <input v-model.trim.lazy="$v.email.$model"
-                 autocomplete="email"
-                 type="text"
-                 class="checkout-input-field"/>
-        </BaseFormField>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { required, email } from 'vuelidate/lib/validators';
-import BaseFormField from '../common/BaseFormField.vue';
-
-export default {
-  components: {
-    BaseFormField,
-  },
-
-  data: () => ({
-    firstName: null,
-    lastName: null,
-    streetName: null,
-    additionalStreetInfo: null,
-    city: null,
-    postalCode: null,
-    country: null,
-    phone: null,
-    email: null,
-  }),
-
-  validations() {
-    return {
-      firstName: {
-        required,
-      },
-      lastName: {
-        required,
-      },
-      streetName: {
-        required,
-      },
-      additionalStreetInfo: {
-      },
-      city: {
-        required,
-      },
-      postalCode: {
-        required,
-      },
-      country: {
-        required,
-      },
-      phone: {
-      },
-      email: {
-        required,
-        email,
-      },
-    };
-  },
-};
-</script>
-
-<i18n>
-en:
-  firstName: "First Name"
-  lastName: "Last Name"
-  streetName: "Address"
-  additionalStreetInfo: "Additional address info"
-  city: "City"
-  postalCode: "Postal Code"
-  country: "Country"
-  email: "Email"
-  phone: "Phone"
-de:
-  firstName: "Vorname"
-  lastName: "Nachname"
-  streetName: "Straße und Hausnummer"
-  additionalStreetInfo: "Adresszusatz"
-  city: "Stadt"
-  postalCode: "PLZ"
-  country: "Land"
-  email: "E-Mail-Adresse"
-  phone: "Telefon"
-</i18n>
diff --git a/src/components/checkout/PageCheckout.vue b/src/components/checkout/PageCheckout.vue
index fe0417dc..bcd057ae 100644
--- a/src/components/checkout/PageCheckout.vue
+++ b/src/components/checkout/PageCheckout.vue
@@ -51,12 +51,10 @@
 
 <script>
 import CartOverview from './CartOverview.vue';
-import StepAddressForm from './StepAddressForm.vue';
 
 export default {
   components: {
     CartOverview,
-    StepAddressForm,
   },
 
   props: ['showStep'],
diff --git a/src/components/checkout/StepAddressForm.vue b/src/components/checkout/StepAddressForm.vue
index ced2c8da..e2a42acf 100644
--- a/src/components/checkout/StepAddressForm.vue
+++ b/src/components/checkout/StepAddressForm.vue
@@ -1,11 +1,5 @@
 <template>
-  <form>
-    <div class="shipping-info">
-      <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
-      <span class="pull-right required-fields">{{ $t('form.required') }} *</span>
-    </div>
-    <BaseAddressForm/>
-
+  <div></div>
     <!--<div class="row different-billing-row">-->
       <!--<div class="col-sm-12">-->
         <!--<div class="different-for-billing input-block">-->
@@ -63,34 +57,20 @@
       <!--</div>-->
     <!--</div>-->
     <!--{{> checkout/continue-checkout-button}}-->
-  </form>
 </template>
 
 <script>
-import BaseAddressForm from './BaseAddressForm.vue';
-
 export default {
-  components: {
-    BaseAddressForm,
-  },
 };
 </script>
 
-<style scoped>
-.address-form {
-  margin: 0.5em 1em;
-}
-</style>
-
 <i18n>
 en:
-  shippingInformation: "Shipping Information"
   shippingAddress: "Shipping Address"
   billingAddress: "Billing Address"
   title: "Secure Checkout - Shipping"
   differentBillingAddressCheckboxLabel: "Use a different address for billing"
 de:
-  shippingInformation: "Versand Information"
   billingAddress: "Zahlungsadresse"
   shippingAddress: "Versandadresse"
   title: "Sicherer Bestellprozess - Versand"
diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
new file mode 100644
index 00000000..fd6c1f4a
--- /dev/null
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -0,0 +1,212 @@
+<template>
+  <form @submit="submit(setShippingAddress)">
+    <div class="shipping-info">
+      <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
+      <span class="pull-right required-fields">{{ $t('form.required') }} *</span>
+    </div>
+    <div class="address-form">
+      <div class="row">
+        <div class="col-sm-6">
+          <BaseInput v-model="form.firstName"
+                     :vuelidate="$v.form.firstName"
+                     :label="$t('firstName')"
+                     type="text"
+                     autocomplete="fname"
+                     class="checkout-input-field"/>
+        </div>
+        <div class="col-sm-6">
+          <BaseInput v-model="form.lastName"
+                     :vuelidate="$v.form.lastName"
+                     :label="$t('lastName')"
+                     type="text"
+                     autocomplete="lname"
+                     class="checkout-input-field"/>
+        </div>
+        <div class="col-sm-12">
+          <BaseInput v-model="form.streetName"
+                     :vuelidate="$v.form.streetName"
+                     :label="$t('streetName')"
+                     type="text"
+                     autocomplete="shipping street-address"
+                     class="checkout-input-field"/>
+        </div>
+        <div class="col-sm-12">
+          <BaseInput v-model="form.additionalStreetInfo"
+                     :vuelidate="$v.form.additionalStreetInfo"
+                     :label="$t('additionalStreetInfo')"
+                     type="text"
+                     class="checkout-input-field"/>
+        </div>
+        <div class="col-sm-4">
+          <BaseInput v-model="form.city"
+                     :vuelidate="$v.form.city"
+                     :label="$t('city')"
+                     type="text"
+                     autocomplete="shipping locality"
+                     class="checkout-input-field"/>
+        </div>
+        <div class="col-sm-3">
+          <BaseInput v-model="form.postalCode"
+                     :vuelidate="$v.form.postalCode"
+                     :label="$t('postalCode')"
+                     type="text"
+                     autocomplete="shipping postal-code"
+                     class="checkout-input-field"/>
+        </div>
+        <div class="col-sm-5">
+          <div class="country input-block">
+            <BaseSelect v-model="form.country"
+                        :vuelidate="$v.form.country"
+                        :label="$t('country')"
+                        class="checkout-dropdown"/>
+          </div>
+        </div>
+      </div>
+      <hr>
+      <div class="row">
+        <div class="col-sm-6">
+          <BaseInput v-model="form.phone"
+                     :vuelidate="$v.form.phone"
+                     :label="$t('phone')"
+                     type="text"
+                     autocomplete="tel"
+                     class="checkout-input-field"/>
+        </div>
+        <div class="col-sm-6">
+          <BaseInput v-model="form.email"
+                     :vuelidate="$v.form.email"
+                     :label="$t('email')"
+                     type="email"
+                     autocomplete="email"
+                     class="checkout-input-field"/>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-6">
+        <div>
+          <LoadingButton id="shipping-continue-checkout-btn-xs"
+                         class="btn text-uppercase checkout-checkout-btn">
+            {{ $t('continue') }}
+          </LoadingButton>
+        </div>
+      </div>
+    </div>
+  </form>
+</template>
+
+<script>
+import gql from 'graphql-tag';
+import { required, email } from 'vuelidate/lib/validators';
+import BaseInput from '../common/BaseInput.vue';
+import BaseSelect from '../common/BaseSelect.vue';
+import LoadingButton from '../common/LoadingButton.vue';
+
+export default {
+  components: {
+    LoadingButton,
+    BaseSelect,
+    BaseInput,
+  },
+
+  props: {
+    address: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+
+  data: () => ({
+    me: null,
+    form: {},
+  }),
+
+  methods: {
+    setShippingAddress() {
+      return this.updateMyCart([
+        { setShippingAddress: { address: this.form } },
+      ]);
+    },
+  },
+
+  watch: {
+    address(value) {
+      this.form = { ...value.activeCart.shippingAddress };
+    },
+  },
+
+  apollo: {
+    me: {
+      query: gql`
+        query me {
+          me {
+            activeCart {
+              id
+              version
+              shippingAddress {
+                firstName
+                lastName
+                streetName
+                additionalStreetInfo
+                city
+                postalCode
+                country
+                phone
+                email
+              }
+            }
+          }
+        }`,
+    },
+  },
+
+  validations() {
+    return {
+      form: {
+        firstName: { required },
+        lastName: { required },
+        streetName: { required },
+        additionalStreetInfo: {},
+        city: { required },
+        postalCode: { required },
+        country: { required },
+        phone: {},
+        email: { required, email },
+      },
+    };
+  },
+};
+</script>
+
+<style scoped>
+.address-form {
+  margin: 0.5em 1em;
+}
+</style>
+
+<i18n>
+en:
+  shippingInformation: "Shipping Information"
+  firstName: "First Name"
+  lastName: "Last Name"
+  streetName: "Address"
+  additionalStreetInfo: "Additional address info"
+  city: "City"
+  postalCode: "Postal Code"
+  country: "Country"
+  email: "Email"
+  phone: "Phone"
+  continue: "Continue"
+de:
+  shippingInformation: "Versand Information"
+  firstName: "Vorname"
+  lastName: "Nachname"
+  streetName: "Straße und Hausnummer"
+  additionalStreetInfo: "Adresszusatz"
+  city: "Stadt"
+  postalCode: "PLZ"
+  country: "Land"
+  email: "E-Mail-Adresse"
+  phone: "Telefon"
+  continue: "Weiter"
+</i18n>
diff --git a/src/components/common/BaseFormField.vue b/src/components/common/BaseFormField.vue
deleted file mode 100644
index ba2ce57c..00000000
--- a/src/components/common/BaseFormField.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-<div class="form-field"
-     :class="{ 'form-error': vuelidate.$error, 'labelled': label }">
-  <span v-if="label"
-        class="field-label text-uppercase">
-    {{ label }}
-    <span v-if="required"
-          :title="$t('required')"
-          class="field-required">
-      *
-    </span>
-  </span>
-  <slot></slot>
-  <div v-if="vuelidate.$error"
-       data-test="validation-error-list">
-    <div v-for="validation in validations"
-         :key="validation">
-      <div v-if="!vuelidate[validation]"
-           :validation="validation"
-           data-test="validation-error">
-        <div class="form-error-bubble">
-          {{ getErrorMessage(validation) }}
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-</template>
-
-<script>
-export default {
-  props: {
-    vuelidate: {
-      type: Object,
-      required: true,
-    },
-    customMessages: {
-      type: Object,
-      default() { return {}; },
-    },
-    label: {
-      type: String,
-    },
-  },
-
-  computed: {
-    validations() {
-      return Object.keys(this.vuelidate.$params);
-    },
-
-    required() {
-      return this.vuelidate.$params.required;
-    },
-  },
-
-  methods: {
-    getErrorMessage(validation) {
-      const customMessage = this.customMessages[validation];
-      if (customMessage) {
-        return customMessage;
-      }
-      const { type, ...args } = this.vuelidate.$params[validation];
-      return this.$te(type) ? this.$t(type, args) : this.$t('unknownValidation');
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-error-bubble {
-  position: absolute;
-  z-index: 1000;
-  padding: 5px;
-  margin-top: 6px;
-  background: rgb(250, 226, 226);
-  border: 0px solid rgba(136, 136, 136, 0.747);
-  border-radius: 4px;
-  color: rgb(114, 36, 36);
-  box-shadow: 1px 1px 1px rgb(153, 153, 153);
-}
-
-.form-error-bubble:after {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 50%;
-  width: 0;
-  height: 0;
-  border: 6px solid transparent;
-  border-bottom-color: rgb(250, 226, 226);
-  border-top: 0;
-  margin-left: -20px;
-  margin-top: -6px;
-}
-
-.form-error input:not([type=checkbox]) {
-  border-color: rgba(206, 65, 65, 0.6);
-}
-
-.field-required {
-  color: #D54D4D;
-  cursor: default;
-}
-
-.form-field.labelled {
-  padding-top: 15px;
-}
-</style>
-
-<i18n>
-en:
-  unknownValidation: "Invalid field"
-  required: "Required field"
-  email: "A valid email is required"
-  minLength: "It should contain at least {min} characters"
-de:
-  unknownValidation: "Ungültiger Feldwert"
-  required: "Pflichtfeld"
-  email: "Eine gültige E-Mail ist erforderlich"
-  minLength: "Es sollte mindestens {min} Zeichen enthalten"
-</i18n>
diff --git a/src/components/common/BaseInput.vue b/src/components/common/BaseInput.vue
index 3799f7fe..1a53f8ca 100644
--- a/src/components/common/BaseInput.vue
+++ b/src/components/common/BaseInput.vue
@@ -1,29 +1,29 @@
 <template>
-  <div class="form-field">
-    <label v-if="label"
-           class="field-label text-uppercase">
-      {{ label }}
-      <span v-if="required"
-            :title="$t('required')"
-            class="field-required">
-        *
-      </span>
+  <span :class="{ 'error': vuelidate.$error }"
+        class="form-field">
+    <BaseLabel v-if="label"
+               :vuelidate="vuelidate"
+               :label="label">
       <input v-model="model"
-             v-bind="$attrs"
-             :class="{ 'error': vuelidate.$error }"/>
-    </label>
+             v-bind="$attrs"/>
+    </BaseLabel>
+    <input v-else
+           v-model="model"
+           v-bind="$attrs"/>
     <ValidationError :vuelidate="vuelidate"
                      :customErrors="customErrors"/>
-  </div>
+  </span>
 </template>
 
 <script>
 import ValidationError from './ValidationError.vue';
+import BaseLabel from './BaseLabel.vue';
 
 export default {
   inheritAttrs: false,
 
   components: {
+    BaseLabel,
     ValidationError,
   },
 
@@ -53,32 +53,16 @@ export default {
         this.$emit('input', value);
       },
     },
-
-    required() {
-      return this.vuelidate.$params.required;
-    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-label {
-  padding-top: 15px;
+.form-field {
+  width: 100%;
 }
 
-.error {
+.error input {
   border-color: rgba(206, 65, 65, 0.6);
 }
-
-.field-required {
-  color: #D54D4D;
-  cursor: default;
-}
 </style>
-
-<i18n>
-en:
-  required: "Required field"
-de:
-  required: "Pflichtfeld"
-</i18n>
diff --git a/src/components/common/BaseLabel.vue b/src/components/common/BaseLabel.vue
new file mode 100644
index 00000000..131bd979
--- /dev/null
+++ b/src/components/common/BaseLabel.vue
@@ -0,0 +1,55 @@
+<template>
+  <label v-if="label"
+         class="field-label">
+    <span class="text">{{ label }}</span>
+    <span v-if="required"
+          :title="$t('required')"
+          class="field-required">
+      *
+    </span>
+    <slot></slot>
+  </label>
+</template>
+
+<script>
+export default {
+  props: {
+    vuelidate: {
+      type: Object,
+      required: true,
+    },
+    label: {
+      type: String,
+    },
+  },
+
+  computed: {
+    required() {
+      return this.vuelidate.$params.required;
+    },
+  },
+};
+</script>
+
+<style scoped>
+label {
+  width: 100%;
+  padding-top: 15px;
+}
+
+label .text {
+  text-transform: uppercase
+}
+
+.field-required {
+  color: #D54D4D;
+  cursor: default;
+}
+</style>
+
+<i18n>
+en:
+  required: "Required field"
+de:
+  required: "Pflichtfeld"
+</i18n>
diff --git a/src/components/common/BaseSelect.vue b/src/components/common/BaseSelect.vue
index cc6fb0cb..c0adf854 100644
--- a/src/components/common/BaseSelect.vue
+++ b/src/components/common/BaseSelect.vue
@@ -1,31 +1,27 @@
 <template>
-  <div class="form-field">
-    <label v-if="label"
-           class="field-label text-uppercase">
-      {{ label }}
-      <span v-if="required"
-            :title="$t('required')"
-            class="field-required">
-        *
-      </span>
-      <SelectBoxIt :options="options"
-                   v-model="model"
-                   v-bind="$attrs"
-                   :class="{ 'error': vuelidate.$error }"/>
-    </label>
+  <span :class="{ 'error': vuelidate.$error }"
+        class="form-field">
+    <BaseLabel v-if="label"
+               :vuelidate="vuelidate"
+               :label="label"/>
+    <SelectBoxIt :options="options"
+                 v-model="model"
+                 v-bind="$attrs"/>
     <ValidationError :vuelidate="vuelidate"
                      :customErrors="customErrors"/>
-  </div>
+  </span>
 </template>
 
 <script>
 import ValidationError from './ValidationError.vue';
 import SelectBoxIt from './SelectBoxIt.vue';
+import BaseLabel from './BaseLabel.vue';
 
 export default {
   inheritAttrs: false,
 
   components: {
+    BaseLabel,
     SelectBoxIt,
     ValidationError,
   },
@@ -38,6 +34,10 @@ export default {
       type: Object,
       required: true,
     },
+    options: {
+      type: Array,
+      required: true,
+    },
     label: {
       type: String,
     },
@@ -56,32 +56,12 @@ export default {
         this.$emit('input', value);
       },
     },
-
-    required() {
-      return this.vuelidate.$params.required;
-    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-label {
-  padding-top: 15px;
-}
-
-.error {
+.error select {
   border-color: rgba(206, 65, 65, 0.6);
 }
-
-.field-required {
-  color: #D54D4D;
-  cursor: default;
-}
 </style>
-
-<i18n>
-en:
-  required: "Required field"
-de:
-  required: "Pflichtfeld"
-</i18n>
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index 143902ec..1d60a5a3 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -4,9 +4,6 @@
       <div class="pull-left">
         <div class="login-box-title">{{ $t('title') }}</div>
       </div>
-      <div class="pull-right">
-        <div class="login-box-required">{{ $t('required') }}*</div>
-      </div>
     </div>
     <hr class="login-box-hr">
     <div class="login-box-description">{{ $t('description') }}</div>
diff --git a/src/components/login/SignUpForm.vue b/src/components/login/SignUpForm.vue
index f6b0870e..074173aa 100644
--- a/src/components/login/SignUpForm.vue
+++ b/src/components/login/SignUpForm.vue
@@ -4,9 +4,6 @@
       <div class="pull-left">
         <div class="signup-box-title">{{ $t('title') }}</div>
       </div>
-      <div class="pull-right">
-        <div class="signup-box-required">{{ $t('required') }}*</div>
-      </div>
     </div>
     <hr class="signup-box-hr">
     <div class="signup-box-description">{{ $t('description') }}</div>
@@ -171,7 +168,6 @@ export default {
 <i18n>
 en:
   title: "New Customer Registration"
-  required: "Required Fields"
   description: "Create an account to store your products, easy checkouts, customer discounts, benefits and more."
   titleSelect: "Title"
   firstName: "First Name"
@@ -189,7 +185,6 @@ en:
   duplicatedEmail: "A customer with this email already exists"
 de:
   title: "Neukunden Resigstrierung"
-  required: "Pflichtfeld"
   description: "Konto einrichten, um das Shoppen noch einfacher zu machen."
   titleSelect: "Titel"
   firstName: "Vorname"
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index 6d3f5f49..dfe1bb84 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -95,7 +95,9 @@ export default {
 
   validations() {
     return {
-      quantity: { required, numeric, between: between(1, MAX_QUANTITY) },
+      form: {
+        quantity: { required, numeric, between: between(1, MAX_QUANTITY) },
+      },
     };
   },
 };
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index f2967541..1e487252 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -2,10 +2,6 @@
   <div v-if="me">
     <div class="personal-details-title">
       <span>{{ $t('title') }}</span>
-      <span v-if="showForm"
-            class="pull-right required-text personal-details-edit-show">
-        {{ $t('main.form.required') }}
-      </span>
     </div>
     <div class="personal-details-edit personal-details-edit-show">
       <transition name="fade"
diff --git a/src/router.js b/src/router.js
index 30134de4..cd699e9b 100644
--- a/src/router.js
+++ b/src/router.js
@@ -129,7 +129,7 @@ const router = new Router({
       },
       props: {
         default: {
-          showStep: 'StepAddressForm',
+          showStep: 'StepShippingAddressForm',
         },
       },
     },

From 4e0f889c845669f5c4c9092d77b5dc4c045fbf9d Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 5 Jun 2019 18:32:49 +0200
Subject: [PATCH 09/69] Fix error message bubble

---
 src/assets/scss/_error-message.scss                 |  8 ++++----
 src/assets/scss/_login-box.scss                     |  1 -
 src/assets/scss/_my-account-personal-details.scss   |  3 +++
 src/assets/scss/_signup-box.scss                    |  1 -
 src/components/common/BaseInput.vue                 | 13 +++++++------
 src/components/common/BaseSelect.vue                | 10 +++++-----
 src/components/common/ValidationError.vue           |  2 +-
 .../useraccount/userdetail/EditProfileForm.vue      |  2 --
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/assets/scss/_error-message.scss b/src/assets/scss/_error-message.scss
index ec8e5b1b..83e1e91f 100644
--- a/src/assets/scss/_error-message.scss
+++ b/src/assets/scss/_error-message.scss
@@ -1,7 +1,7 @@
-.error{
-  color: rgb(196, 56, 56);
-  font-weight: bold;
-}
+//.error{
+//  color: rgb(196, 56, 56);
+//  font-weight: bold;
+//}
 
 .error-message {
   z-index: 1;
diff --git a/src/assets/scss/_login-box.scss b/src/assets/scss/_login-box.scss
index c3ab3696..5e5d0d5d 100644
--- a/src/assets/scss/_login-box.scss
+++ b/src/assets/scss/_login-box.scss
@@ -25,7 +25,6 @@
 }
 .login-box-input {
   span {
-    text-transform: uppercase;
     display: inline-block;
   }
   input {
diff --git a/src/assets/scss/_my-account-personal-details.scss b/src/assets/scss/_my-account-personal-details.scss
index dc759ecd..530428b1 100644
--- a/src/assets/scss/_my-account-personal-details.scss
+++ b/src/assets/scss/_my-account-personal-details.scss
@@ -170,6 +170,9 @@
   padding: 0.5em;
   margin-top: 0.2em;
 }
+//.form-sections {
+//  padding-top: 15px;;
+//}
 .form-notes {
   font-size: 12px;
   color: $gray;
diff --git a/src/assets/scss/_signup-box.scss b/src/assets/scss/_signup-box.scss
index 16a861bb..1efebdbb 100644
--- a/src/assets/scss/_signup-box.scss
+++ b/src/assets/scss/_signup-box.scss
@@ -24,7 +24,6 @@
 }
 .signup-box-input {
   span {
-    text-transform: uppercase;
     display: inline-block;
   }
   input {
diff --git a/src/components/common/BaseInput.vue b/src/components/common/BaseInput.vue
index 1a53f8ca..88e2c996 100644
--- a/src/components/common/BaseInput.vue
+++ b/src/components/common/BaseInput.vue
@@ -1,15 +1,16 @@
 <template>
-  <span :class="{ 'error': vuelidate.$error }"
-        class="form-field">
+  <span class="form-field">
     <BaseLabel v-if="label"
                :vuelidate="vuelidate"
                :label="label">
       <input v-model="model"
-             v-bind="$attrs"/>
+             v-bind="$attrs"
+             :class="{ 'error': vuelidate.$error }"/>
     </BaseLabel>
     <input v-else
            v-model="model"
-           v-bind="$attrs"/>
+           v-bind="$attrs"
+           :class="{ 'error': vuelidate.$error }"/>
     <ValidationError :vuelidate="vuelidate"
                      :customErrors="customErrors"/>
   </span>
@@ -57,12 +58,12 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .form-field {
   width: 100%;
 }
 
-.error input {
+.error {
   border-color: rgba(206, 65, 65, 0.6);
 }
 </style>
diff --git a/src/components/common/BaseSelect.vue b/src/components/common/BaseSelect.vue
index c0adf854..a9ea9fa8 100644
--- a/src/components/common/BaseSelect.vue
+++ b/src/components/common/BaseSelect.vue
@@ -1,12 +1,12 @@
 <template>
-  <span :class="{ 'error': vuelidate.$error }"
-        class="form-field">
+  <span class="form-field">
     <BaseLabel v-if="label"
                :vuelidate="vuelidate"
                :label="label"/>
     <SelectBoxIt :options="options"
                  v-model="model"
-                 v-bind="$attrs"/>
+                 v-bind="$attrs"
+                 :class="{ 'error': vuelidate.$error }"/>
     <ValidationError :vuelidate="vuelidate"
                      :customErrors="customErrors"/>
   </span>
@@ -60,8 +60,8 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-.error select {
+<style scoped>
+.error {
   border-color: rgba(206, 65, 65, 0.6);
 }
 </style>
diff --git a/src/components/common/ValidationError.vue b/src/components/common/ValidationError.vue
index c95ab653..194e923a 100644
--- a/src/components/common/ValidationError.vue
+++ b/src/components/common/ValidationError.vue
@@ -51,7 +51,7 @@ export default {
   position: absolute;
   z-index: 1000;
   padding: 5px;
-  margin-top: 6px;
+  /*margin-top: 6px;*/
   background: rgb(250, 226, 226);
   border: 0px solid rgba(136, 136, 136, 0.747);
   border-radius: 4px;
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index 1e487252..512171fc 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -32,8 +32,6 @@
                            autocomplete="email"
                            class="form-inputs"
                            data-test="edit-profile-form-email"/>
-                <br>
-                <span class="form-notes"></span>
               </div>
             </div>
             <div class="col-sm-6">

From b029f659a1f615e8a7ff22761366a4bfe434eff1 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 5 Jun 2019 19:06:41 +0200
Subject: [PATCH 10/69] Make error messages less invasive

---
 src/components/common/ValidationError.vue | 26 +++++------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/components/common/ValidationError.vue b/src/components/common/ValidationError.vue
index 194e923a..e083ce8e 100644
--- a/src/components/common/ValidationError.vue
+++ b/src/components/common/ValidationError.vue
@@ -48,29 +48,13 @@ export default {
 
 <style lang="scss" scoped>
 .form-error-bubble {
+  font-size: 12px;
   position: absolute;
+  margin-top: -7px;
+  margin-left: 1px;
   z-index: 1000;
-  padding: 5px;
-  /*margin-top: 6px;*/
-  background: rgb(250, 226, 226);
-  border: 0px solid rgba(136, 136, 136, 0.747);
-  border-radius: 4px;
-  color: rgb(114, 36, 36);
-  box-shadow: 1px 1px 1px rgb(153, 153, 153);
-}
-
-.form-error-bubble:after {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 50%;
-  width: 0;
-  height: 0;
-  border: 6px solid transparent;
-  border-bottom-color: rgb(250, 226, 226);
-  border-top: 0;
-  margin-left: -20px;
-  margin-top: -6px;
+  padding: 0;
+  color: rgb(206, 65, 65);
 }
 </style>
 

From 0cbe655f1e370929dec9a9a2df2096a607fe747b Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 5 Jun 2019 19:10:12 +0200
Subject: [PATCH 11/69] Recover server error style

---
 src/components/common/ServerError.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/common/ServerError.vue b/src/components/common/ServerError.vue
index 959590ce..77f2bad2 100644
--- a/src/components/common/ServerError.vue
+++ b/src/components/common/ServerError.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="error"
-       class="error">
+       class="server-error">
     <span v-if="isGraphQLError">
       <slot v-for="graphQLError in graphQLErrors"
             :graphQLError="graphQLError">
@@ -36,6 +36,13 @@ export default {
 };
 </script>
 
+<style scoped>
+.server-error {
+  color: rgb(206, 65, 65);
+  font-weight: bold;
+}
+</style>
+
 <i18n>
 en:
   networkError: "There was a error in the connection, please try again later"

From 87cc7c2b45444d7e9a4c436c916a6068df647784 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 6 Jun 2019 19:37:38 +0200
Subject: [PATCH 12/69] Fix general apollo query in mixin

---
 src/components/BasicCart.gql                  |  8 ++++
 src/components/BasicCustomer.gql              |  8 ++++
 src/components/common/ServerError.vue         |  4 +-
 .../productdetail/AddToCartForm.vue           |  6 +--
 src/mixins/cartMixin.js                       | 45 +++++++------------
 src/mixins/customerMixin.js                   | 18 +++-----
 6 files changed, 40 insertions(+), 49 deletions(-)
 create mode 100644 src/components/BasicCart.gql
 create mode 100644 src/components/BasicCustomer.gql

diff --git a/src/components/BasicCart.gql b/src/components/BasicCart.gql
new file mode 100644
index 00000000..49926def
--- /dev/null
+++ b/src/components/BasicCart.gql
@@ -0,0 +1,8 @@
+{
+  me {
+    activeCart {
+      id
+      version
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/components/BasicCustomer.gql b/src/components/BasicCustomer.gql
new file mode 100644
index 00000000..a467c7ab
--- /dev/null
+++ b/src/components/BasicCustomer.gql
@@ -0,0 +1,8 @@
+{
+  me {
+    customer {
+      id
+      version
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/components/common/ServerError.vue b/src/components/common/ServerError.vue
index 77f2bad2..209db626 100644
--- a/src/components/common/ServerError.vue
+++ b/src/components/common/ServerError.vue
@@ -22,11 +22,11 @@ export default {
 
   computed: {
     isNetworkError() {
-      return this.error && this.error.networkError;
+      return this.error?.networkError;
     },
 
     isGraphQLError() {
-      return this.error && Array.isArray(this.error.graphQLErrors) && this.error.graphQLErrors.length;
+      return Array.isArray(this.error?.graphQLErrors) && this.error?.graphQLErrors.length;
     },
 
     graphQLErrors() {
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index dfe1bb84..a7fb0301 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -77,11 +77,9 @@ export default {
 
   methods: {
     async addLineItem() {
-      if (!this.me.activeCart) {
+      if (!this.cartExists) {
         await this.createMyCart({
-          draft: {
-            currency: this.currency,
-          },
+          currency: this.currency,
         });
       }
       return this.updateMyCart({
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index 7b748f8a..a80530ce 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -1,17 +1,22 @@
 import gql from 'graphql-tag';
-import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
+import BASIC_CART_QUERY from '../components/BasicCart.gql';
+import DISPLAYABLE_MONEY_FRAGMENT from '../components/DisplayableMoney.gql';
 
 export default {
   computed: {
+    cartExists() {
+      return this.me?.activeCart;
+    },
+
     totalItems() {
-      if (this.me?.activeCart) {
+      if (this.cartExists) {
         return this.me.activeCart.lineItems.reduce((acc, li) => acc + li.quantity, 0);
       }
       return 0;
     },
 
     sortedLineItems() {
-      if (this.me?.activeCart) {
+      if (this.cartExists) {
         return [...this.me.activeCart.lineItems].reverse();
       }
       return [];
@@ -75,11 +80,11 @@ export default {
               }
             }
           }
-          ${DisplayableMoneyFragment}`,
+          ${DISPLAYABLE_MONEY_FRAGMENT}`,
         variables: {
           actions,
-          id: this.me?.activeCart?.id,
-          version: this.me?.activeCart?.version,
+          id: this.me.activeCart?.id,
+          version: this.me.activeCart?.version,
           locale: this.$i18n.locale,
         },
       });
@@ -88,7 +93,7 @@ export default {
     createMyCart(draft) {
       return this.$apollo.mutate({
         mutation: gql`
-          mutation createMyCart($draft: MyCartDraft!) {
+          mutation ($draft: MyCartDraft!) {
             createMyCart(draft: $draft) {
               id
               version
@@ -96,35 +101,15 @@ export default {
           }`,
         variables: { draft },
         update: (store, { data: { createMyCart } }) => {
-          const query = gql`
-            query me {
-              me {
-                activeCart {
-                  id
-                  version
-                }
-              }
-            }`;
-          const data = store.readQuery({ query });
+          const data = store.readQuery({ query: BASIC_CART_QUERY });
           data.me.activeCart = createMyCart;
-          store.writeQuery({ query, data });
+          store.writeQuery({ query: BASIC_CART_QUERY, data });
         },
       });
     },
   },
 
   apollo: {
-    me: {
-      query: gql`
-        query me {
-          me {
-            activeCart {
-              id
-              version
-            }
-          }
-        }`,
-      skip: vm => !vm.$store.state.authenticated,
-    },
+    me: BASIC_CART_QUERY,
   },
 };
diff --git a/src/mixins/customerMixin.js b/src/mixins/customerMixin.js
index 23d3afc5..114f15a1 100644
--- a/src/mixins/customerMixin.js
+++ b/src/mixins/customerMixin.js
@@ -1,8 +1,11 @@
 import gql from 'graphql-tag';
+import BASIC_CUSTOMER_QUERY from '../components/BasicCustomer.gql';
 
 export default {
   methods: {
     updateMyCustomer(actions) {
+      // Issue with under-fetching on mutations https://github.com/apollographql/apollo-client/issues/3267
+      // required any queried field to be fetched in order to update all components using customers
       return this.$apollo.mutate({
         mutation: gql`
           mutation updateMyCustomer($actions: [MyCustomerUpdateAction!]!, $version: Long!) {
@@ -15,7 +18,7 @@ export default {
             }
           }`,
         variables: {
-          version: this.me?.customer?.version,
+          version: this.me.customer?.version,
           actions,
         },
       });
@@ -23,17 +26,6 @@ export default {
   },
 
   apollo: {
-    me: {
-      query: gql`
-        query me {
-          me {
-            customer {
-              id
-              version
-            }
-          }
-        }`,
-      skip: vm => !vm.$store.state.authenticated,
-    },
+    me: BASIC_CUSTOMER_QUERY,
   },
 };

From 9a36201e5b799f1012b6b57dab645300c4663cda Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 7 Jun 2019 16:35:29 +0200
Subject: [PATCH 13/69] Fix e2e and enable request through XHR

---
 graphql.schema.json                           | 25050 +++++++++++-----
 package.json                                  |     3 +-
 .../cartdetail/LineItemDeleteForm.vue         |     3 +-
 .../cartdetail/LineItemQuantityForm.vue       |     5 +-
 .../checkout/StepShippingAddressForm.vue      |     6 +-
 src/components/common/CartLikePriceDetail.vue |     6 +-
 .../common/{ => form}/BaseInput.vue           |     2 +-
 .../common/{ => form}/BaseSelect.vue          |     4 +-
 .../common/{ => form}/LoadingButton.vue       |     2 +-
 .../common/{ => form}/ServerError.vue         |     0
 .../common/{ => form}/ValidationError.vue     |     0
 src/components/header/MiniCart.vue            |     4 +-
 src/components/login/LoginForm.vue            |     6 +-
 src/components/login/SignUpForm.vue           |     6 +-
 .../productdetail/AddToCartForm.vue           |     6 +-
 .../productoverview/ProductList.vue           |    64 +-
 .../userdetail/EditProfileForm.vue            |     6 +-
 src/main.js                                   |     3 +
 tests/e2e/specs/cartDetailPage_spec.js        |    54 +-
 tests/e2e/specs/miniCart_spec.js              |     8 +-
 tests/e2e/specs/orderDetail_spec.js           |    16 +-
 tests/e2e/specs/orderList_spec.js             |     4 +-
 tests/e2e/specs/pageProductOverview_spec.js   |     2 +
 tests/e2e/support/commands.js                 |   144 +-
 tests/e2e/support/index.js                    |     7 +
 tests/e2e/support/mutations.js                |    88 +
 tests/e2e/support/queries.js                  |    33 +
 yarn.lock                                     |    10 +-
 28 files changed, 17191 insertions(+), 8351 deletions(-)
 rename src/components/common/{ => form}/BaseInput.vue (96%)
 rename src/components/common/{ => form}/BaseSelect.vue (92%)
 rename src/components/common/{ => form}/LoadingButton.vue (97%)
 rename src/components/common/{ => form}/ServerError.vue (100%)
 rename src/components/common/{ => form}/ValidationError.vue (100%)
 create mode 100644 tests/e2e/support/mutations.js
 create mode 100644 tests/e2e/support/queries.js

diff --git a/graphql.schema.json b/graphql.schema.json
index 4dc1cb87..75098769 100644
--- a/graphql.schema.json
+++ b/graphql.schema.json
@@ -9,6 +9,105 @@
       },
       "subscriptionType": null,
       "types": [
+        {
+          "kind": "OBJECT",
+          "name": "APIClientWithSecret",
+          "description": "API Clients can be used to obtain OAuth 2 access tokens. The secret is only shown once in the response of creating the API Client.",
+          "fields": [
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "scope",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastUsedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Date",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "secret",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "AbsoluteDiscountValue",
@@ -104,6 +203,29 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INTERFACE",
+          "name": "ActiveCartInterface",
+          "description": "A field to access the active cart.",
+          "fields": [
+            {
+              "name": "activeCart",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Cart",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "AddCartCustomLineItem",
@@ -155,7 +277,7 @@
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -588,19 +710,19 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "AddInventoryEntryQuantity",
+          "name": "AddCustomerStore",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "quantity",
+              "name": "store",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
                   "ofType": null
                 }
               },
@@ -613,19 +735,19 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "AddLocation",
+          "name": "AddInventoryEntryQuantity",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "location",
+              "name": "quantity",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "ZoneLocation",
+                  "kind": "SCALAR",
+                  "name": "Long",
                   "ofType": null
                 }
               },
@@ -739,69 +861,164 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "AddProductAsset",
+          "name": "AddOrderDelivery",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
+              "name": "items",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DeliveryItemDraftType",
+                    "ofType": null
+                  }
+                }
               },
-              "defaultValue": null
+              "defaultValue": "[]"
             },
             {
-              "name": "sku",
+              "name": "parcels",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DeliveryItemDraftType",
+                    "ofType": null
+                  }
+                }
               },
-              "defaultValue": null
+              "defaultValue": "[]"
             },
             {
-              "name": "catalog",
+              "name": "address",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "AddressInput",
                 "ofType": null
               },
               "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "AddOrderItemShippingAddress",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "address",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "AddressInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "AddOrderParcelToDelivery",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "deliveryId",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "measurements",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
+                "kind": "INPUT_OBJECT",
+                "name": "ParcelMeasurementsDraftType",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
             },
             {
-              "name": "position",
+              "name": "trackingData",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "INPUT_OBJECT",
+                "name": "TrackingDataDraftType",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "asset",
+              "name": "items",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "DeliveryItemDraftType",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": "[]"
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "AddOrderPayment",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "payment",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "AssetDraftInput",
+                  "name": "ResourceIdentifierInput",
                   "ofType": null
                 }
               },
@@ -814,53 +1031,51 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "AddProductExternalImage",
+          "name": "AddOrderReturnInfo",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
+              "name": "items",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "ReturnItemDraftType",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "sku",
+              "name": "returnDate",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "image",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "ImageInput",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "staged",
+              "name": "returnTrackingId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -869,7 +1084,137 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "AddProductPrice",
+          "name": "AddProductAsset",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "variantId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "catalog",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
+            },
+            {
+              "name": "position",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "asset",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "AssetDraftInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "AddProductExternalImage",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "variantId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "image",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ImageInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "AddProductPrice",
           "description": null,
           "fields": null,
           "inputFields": [
@@ -1104,7 +1449,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "ReferenceInput",
+                  "name": "ResourceIdentifierInput",
                   "ofType": null
                 }
               },
@@ -1143,7 +1488,32 @@
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "ReferenceInput",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "AddZoneLocation",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "location",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ZoneLocation",
                   "ofType": null
                 }
               },
@@ -2614,6 +2984,16 @@
                 "ofType": null
               },
               "defaultValue": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -2797,6 +3177,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "setKey",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetCartDiscountKey",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "setValidFrom",
               "description": null,
@@ -2968,7 +3358,7 @@
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -3154,6 +3544,16 @@
                 "ofType": null
               },
               "defaultValue": "Customer"
+            },
+            {
+              "name": "store",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ResourceIdentifierInput",
+                "ofType": null
+              },
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -5098,89 +5498,71 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ChangeProductAssetName",
+          "name": "ChangeOrderPaymentState",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "sku",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "catalog",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "staged",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "defaultValue": "true"
-            },
-            {
-              "name": "name",
+              "name": "paymentState",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "LocalizedStringItemInputType",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "ENUM",
+                  "name": "PaymentState",
+                  "ofType": null
                 }
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ChangeOrderShipmentState",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "assetKey",
+              "name": "shipmentState",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ShipmentState",
+                  "ofType": null
+                }
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ChangeOrderState",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "assetId",
+              "name": "orderState",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "OrderState",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             }
@@ -5191,7 +5573,100 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ChangeProductAssetOrder",
+          "name": "ChangeProductAssetName",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "variantId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "catalog",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
+            },
+            {
+              "name": "name",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "LocalizedStringItemInputType",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "assetKey",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "assetId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ChangeProductAssetOrder",
           "description": null,
           "fields": null,
           "inputFields": [
@@ -6054,7 +6529,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -6126,6 +6601,88 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "CreateApiClient",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "name",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "scope",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "CreateStore",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "CreateZone",
@@ -6146,6 +6703,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "description",
               "description": null,
@@ -6201,7 +6768,7 @@
             },
             {
               "name": "value",
-              "description": null,
+              "description": "The value of this custom field as escaped JSON., based on the FieldDefinition of the Type.\n\nExamples:\n\n* FieldType `String`: `\"\\\"This is a string\\\"\"`\n* FieldType `Number`: `\"4\"`\n* FieldType `Set` with an elementType of `String`: `\"[\\\"This is a string\\\", \\\"This is another string\\\"]\"`\n* FieldType `Reference`: `\"{\\\"id\\\", \\\"b911b62d-353a-4388-93ee-8d488d9af962\\\", \\\"typeId\\\", \\\"product\\\"}\"`\n",
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -6388,6 +6955,163 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "CustomLineItemReturnItem",
+          "description": null,
+          "fields": [
+            {
+              "name": "type",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customLineItemId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "quantity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "comment",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shipmentState",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnShipmentState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "paymentState",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnPaymentState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "ReturnItem",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "CustomLineItemsTarget",
@@ -7270,6 +7994,24 @@
                 "ofType": null
               },
               "defaultValue": null
+            },
+            {
+              "name": "stores",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ResourceIdentifierInput",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -7403,6 +8145,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "addStore",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "AddCustomerStore",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "changeAddress",
               "description": null,
@@ -7453,6 +8205,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "removeStore",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "RemoveCustomerStore",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "setCompanyName",
               "description": null,
@@ -7603,6 +8365,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "setStores",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetCustomerStores",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "setTitle",
               "description": null,
@@ -7956,6 +8728,45 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "DeliveryItemDraftType",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "id",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "quantity",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "DimensionsInput",
@@ -8810,6 +9621,45 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ExternalOAuthDraft",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "url",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "authorizationHeader",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "ExternalTaxAmountDraft",
@@ -8924,6 +9774,16 @@
                 }
               },
               "defaultValue": "[]"
+            },
+            {
+              "name": "includedInPrice",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "false"
             }
           ],
           "interfaces": null,
@@ -9287,6 +10147,100 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ImportOrderCustomLineItemState",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "customLineItemId",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "state",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "ItemStateDraftType",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ImportOrderLineItemState",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "lineItemId",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "state",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "ItemStateDraftType",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "InventoryEntryDraft",
@@ -9342,7 +10296,7 @@
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -9486,6 +10440,78 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ItemShippingDetailsDraftType",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "targets",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "ShippingTargetDraftType",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ItemStateDraftType",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "quantity",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "state",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ReferenceInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "LineItemDraft",
@@ -9607,6 +10633,163 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "LineItemReturnItem",
+          "description": null,
+          "fields": [
+            {
+              "name": "type",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lineItemId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "quantity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "comment",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shipmentState",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnShipmentState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "paymentState",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnPaymentState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "ReturnItem",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "LineItemsTarget",
@@ -9865,7 +11048,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -10065,7 +11248,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
@@ -10141,7 +11324,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
@@ -10274,7 +11457,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -10444,7 +11627,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
@@ -10504,7 +11687,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
@@ -11407,6 +12590,42 @@
               "name": "updateCustomerGroup",
               "description": null,
               "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "actions",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "LIST",
+                      "name": null,
+                      "ofType": {
+                        "kind": "NON_NULL",
+                        "name": null,
+                        "ofType": {
+                          "kind": "INPUT_OBJECT",
+                          "name": "CustomerGroupUpdateAction",
+                          "ofType": null
+                        }
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "id",
                   "description": "Queries with specified ID",
@@ -11426,7 +12645,94 @@
                     "ofType": null
                   },
                   "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CustomerGroup",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deleteCustomerGroup",
+              "description": null,
+              "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CustomerGroup",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createCategory",
+              "description": null,
+              "args": [
+                {
+                  "name": "draft",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "CategoryDraft",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Category",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "updateCategory",
+              "description": null,
+              "args": [
                 {
                   "name": "version",
                   "description": null,
@@ -11455,27 +12761,14 @@
                         "name": null,
                         "ofType": {
                           "kind": "INPUT_OBJECT",
-                          "name": "CustomerGroupUpdateAction",
+                          "name": "CategoryUpdateAction",
                           "ofType": null
                         }
                       }
                     }
                   },
                   "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "OBJECT",
-                "name": "CustomerGroup",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "deleteCustomerGroup",
-              "description": null,
-              "args": [
+                },
                 {
                   "name": "id",
                   "description": "Queries with specified ID",
@@ -11495,47 +12788,6 @@
                     "ofType": null
                   },
                   "defaultValue": null
-                },
-                {
-                  "name": "version",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "OBJECT",
-                "name": "CustomerGroup",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "createCategory",
-              "description": null,
-              "args": [
-                {
-                  "name": "draft",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "CategoryDraft",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
                 }
               ],
               "type": {
@@ -11547,29 +12799,9 @@
               "deprecationReason": null
             },
             {
-              "name": "updateCategory",
+              "name": "deleteCategory",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": "Queries with specified ID",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "key",
-                  "description": "Queries with specified key",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -11584,41 +12816,6 @@
                   },
                   "defaultValue": null
                 },
-                {
-                  "name": "actions",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "LIST",
-                      "name": null,
-                      "ofType": {
-                        "kind": "NON_NULL",
-                        "name": null,
-                        "ofType": {
-                          "kind": "INPUT_OBJECT",
-                          "name": "CategoryUpdateAction",
-                          "ofType": null
-                        }
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Category",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "deleteCategory",
-              "description": null,
-              "args": [
                 {
                   "name": "id",
                   "description": "Queries with specified ID",
@@ -11638,20 +12835,6 @@
                     "ofType": null
                   },
                   "defaultValue": null
-                },
-                {
-                  "name": "version",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
                 }
               ],
               "type": {
@@ -11693,26 +12876,6 @@
               "name": "updateProductType",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": "Queries with specified ID",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "key",
-                  "description": "Queries with specified key",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -11748,6 +12911,26 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -11762,6 +12945,20 @@
               "name": "deleteProductType",
               "description": null,
               "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "id",
                   "description": "Queries with specified ID",
@@ -11781,20 +12978,6 @@
                     "ofType": null
                   },
                   "defaultValue": null
-                },
-                {
-                  "name": "version",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
                 }
               ],
               "type": {
@@ -11836,26 +13019,6 @@
               "name": "updateShippingMethod",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": "Queries with specified ID",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "key",
-                  "description": "Queries with specified key",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -11884,13 +13047,33 @@
                         "name": null,
                         "ofType": {
                           "kind": "INPUT_OBJECT",
-                          "name": "UpdateShippingMethodAction",
+                          "name": "ShippingMethodUpdateAction",
                           "ofType": null
                         }
                       }
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -11905,6 +13088,20 @@
               "name": "deleteShippingMethod",
               "description": null,
               "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "id",
                   "description": "Queries with specified ID",
@@ -11924,20 +13121,6 @@
                     "ofType": null
                   },
                   "defaultValue": null
-                },
-                {
-                  "name": "version",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
                 }
               ],
               "type": {
@@ -11979,20 +13162,6 @@
               "name": "updateZone",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -12028,6 +13197,26 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -12043,30 +13232,36 @@
               "description": null,
               "args": [
                 {
-                  "name": "id",
+                  "name": "version",
                   "description": null,
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
                       "kind": "SCALAR",
-                      "name": "String",
+                      "name": "Long",
                       "ofType": null
                     }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "version",
-                  "description": null,
+                  "name": "id",
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
@@ -12110,26 +13305,6 @@
               "name": "updateTaxCategory",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": "Queries with specified ID",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "key",
-                  "description": "Queries with specified key",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -12165,6 +13340,26 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -12179,6 +13374,20 @@
               "name": "deleteTaxCategory",
               "description": null,
               "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "id",
                   "description": "Queries with specified ID",
@@ -12198,20 +13407,6 @@
                     "ofType": null
                   },
                   "defaultValue": null
-                },
-                {
-                  "name": "version",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
                 }
               ],
               "type": {
@@ -12384,20 +13579,6 @@
               "name": "updateCartDiscount",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -12433,6 +13614,26 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -12448,30 +13649,36 @@
               "description": null,
               "args": [
                 {
-                  "name": "id",
+                  "name": "version",
                   "description": null,
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
                       "kind": "SCALAR",
-                      "name": "String",
+                      "name": "Long",
                       "ofType": null
                     }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "version",
-                  "description": null,
+                  "name": "id",
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
@@ -12515,20 +13722,6 @@
               "name": "updateProductDiscount",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -12564,6 +13757,26 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -12579,30 +13792,36 @@
               "description": null,
               "args": [
                 {
-                  "name": "id",
+                  "name": "version",
                   "description": null,
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
                       "kind": "SCALAR",
-                      "name": "String",
+                      "name": "Long",
                       "ofType": null
                     }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "version",
-                  "description": null,
+                  "name": "id",
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
@@ -12646,26 +13865,6 @@
               "name": "updateProduct",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": "Queries with specified ID",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "key",
-                  "description": "Queries with specified key",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -12701,6 +13900,26 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -12715,6 +13934,20 @@
               "name": "deleteProduct",
               "description": null,
               "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "id",
                   "description": "Queries with specified ID",
@@ -12734,20 +13967,6 @@
                     "ofType": null
                   },
                   "defaultValue": null
-                },
-                {
-                  "name": "version",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Long",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
                 }
               ],
               "type": {
@@ -12824,26 +14043,6 @@
               "name": "updateCustomer",
               "description": null,
               "args": [
-                {
-                  "name": "id",
-                  "description": "Queries with specified ID",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "key",
-                  "description": "Queries with specified key",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
                 {
                   "name": "version",
                   "description": null,
@@ -12879,20 +14078,7 @@
                     }
                   },
                   "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Customer",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "deleteCustomer",
-              "description": null,
-              "args": [
+                },
                 {
                   "name": "id",
                   "description": "Queries with specified ID",
@@ -12912,7 +14098,20 @@
                     "ofType": null
                   },
                   "defaultValue": null
-                },
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Customer",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deleteCustomer",
+              "description": null,
+              "args": [
                 {
                   "name": "version",
                   "description": null,
@@ -12936,6 +14135,26 @@
                     "ofType": null
                   },
                   "defaultValue": "false"
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -13614,6 +14833,16 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -13677,6 +14906,16 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -13728,6 +14967,16 @@
                     "ofType": null
                   },
                   "defaultValue": "false"
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -13782,6 +15031,16 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -13845,6 +15104,16 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -13886,6 +15155,16 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -13896,6 +15175,226 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "createOrderFromCart",
+              "description": null,
+              "args": [
+                {
+                  "name": "draft",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "OrderCartCommand",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Order",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "updateOrder",
+              "description": null,
+              "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "actions",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "LIST",
+                      "name": null,
+                      "ofType": {
+                        "kind": "NON_NULL",
+                        "name": null,
+                        "ofType": {
+                          "kind": "INPUT_OBJECT",
+                          "name": "OrderUpdateAction",
+                          "ofType": null
+                        }
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "orderNumber",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Order",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deleteOrder",
+              "description": null,
+              "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "personalDataErasure",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Boolean",
+                    "ofType": null
+                  },
+                  "defaultValue": "false"
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "orderNumber",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Order",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createMyOrderFromCart",
+              "description": null,
+              "args": [
+                {
+                  "name": "draft",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "OrderMyCartCommand",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "storeKey",
+                  "description": "Beta feature. The mutation is only performed if the resource is part of the store. Can be used with store-specific OAuth permissions.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "KeyReferenceInput",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Order",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "updateProject",
               "description": null,
@@ -13944,6 +15443,203 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "createStore",
+              "description": null,
+              "args": [
+                {
+                  "name": "draft",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "CreateStore",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Store",
+                "ofType": null
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
+            },
+            {
+              "name": "updateStore",
+              "description": null,
+              "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "actions",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "LIST",
+                      "name": null,
+                      "ofType": {
+                        "kind": "NON_NULL",
+                        "name": null,
+                        "ofType": {
+                          "kind": "INPUT_OBJECT",
+                          "name": "StoreUpdateAction",
+                          "ofType": null
+                        }
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Store",
+                "ofType": null
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
+            },
+            {
+              "name": "deleteStore",
+              "description": null,
+              "args": [
+                {
+                  "name": "version",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Long",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Store",
+                "ofType": null
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
+            },
+            {
+              "name": "createApiClient",
+              "description": null,
+              "args": [
+                {
+                  "name": "draft",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "CreateApiClient",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "APIClientWithSecret",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deleteApiClient",
+              "description": null,
+              "args": [
+                {
+                  "name": "id",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "APIClientWithoutSecret",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -14046,7 +15742,7 @@
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -14936,57 +16632,14 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "OBJECT",
-          "name": "PlainEnumValue",
-          "description": null,
-          "fields": [
-            {
-              "name": "key",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "label",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "INPUT_OBJECT",
-          "name": "PlainEnumValueDraft",
+          "name": "OrderCartCommand",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "key",
+              "name": "id",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -15000,150 +16653,82 @@
               "defaultValue": null
             },
             {
-              "name": "label",
+              "name": "version",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Long",
                   "ofType": null
                 }
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "PlainEnumValueResult",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "limit",
+              "name": "paymentState",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "ENUM",
+                "name": "PaymentState",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "offset",
+              "name": "orderState",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "ENUM",
+                "name": "OrderState",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "total",
+              "name": "state",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "results",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "PlainEnumValue",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "PriceFunction",
-          "description": null,
-          "fields": [
-            {
-              "name": "function",
+              "name": "shipmentState",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "ENUM",
+                "name": "ShipmentState",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "currencyCode",
+              "name": "orderNumber",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Currency",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "PriceFunctionDraft",
+          "name": "OrderMyCartCommand",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "function",
+              "name": "id",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -15157,14 +16742,14 @@
               "defaultValue": null
             },
             {
-              "name": "currencyCode",
+              "name": "version",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Currency",
+                  "name": "Long",
                   "ofType": null
                 }
               },
@@ -15177,703 +16762,538 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ProductAttributeInput",
+          "name": "OrderUpdateAction",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "name",
+              "name": "addDelivery",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "AddOrderDelivery",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "value",
+              "name": "addItemShippingAddress",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "AddOrderItemShippingAddress",
+                "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "ProductDiscountDraft",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "value",
+              "name": "addParcelToDelivery",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "ProductDiscountValueInput",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "AddOrderParcelToDelivery",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "predicate",
+              "name": "addPayment",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "AddOrderPayment",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "sortOrder",
+              "name": "addReturnInfo",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "AddOrderReturnInfo",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "name",
+              "name": "changeOrderState",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "LocalizedStringItemInputType",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeOrderState",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "description",
+              "name": "changePaymentState",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeOrderPaymentState",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "validFrom",
+              "name": "changeShipmentState",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeOrderShipmentState",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "validUntil",
+              "name": "importCustomLineItemState",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
+                "kind": "INPUT_OBJECT",
+                "name": "ImportOrderCustomLineItemState",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "isActive",
+              "name": "importLineItemState",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
+                "kind": "INPUT_OBJECT",
+                "name": "ImportOrderLineItemState",
                 "ofType": null
               },
-              "defaultValue": "true"
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "ProductDiscountUpdateAction",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+              "defaultValue": null
+            },
             {
-              "name": "changeIsActive",
+              "name": "removeDelivery",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeProductDiscountIsActive",
+                "name": "RemoveOrderDelivery",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeName",
+              "name": "removeItemShippingAddress",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeProductDiscountName",
+                "name": "RemoveOrderItemShippingAddress",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changePredicate",
+              "name": "removeParcelFromDelivery",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeProductDiscountPredicate",
+                "name": "RemoveOrderParcelFromDelivery",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeSortOrder",
+              "name": "removePayment",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeProductDiscountSortOrder",
+                "name": "RemoveOrderPayment",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeValue",
+              "name": "setBillingAddress",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeProductDiscountValue",
+                "name": "SetOrderBillingAddress",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setDescription",
+              "name": "setCustomField",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductDiscountDescription",
+                "name": "SetOrderCustomField",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setValidFrom",
+              "name": "setCustomLineItemCustomField",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductDiscountValidFrom",
+                "name": "SetOrderCustomLineItemCustomField",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setValidFromAndUntil",
+              "name": "setCustomLineItemCustomType",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductDiscountValidFromAndUntil",
+                "name": "SetOrderCustomLineItemCustomType",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setValidUntil",
+              "name": "setCustomLineItemShippingDetails",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductDiscountValidUntil",
+                "name": "SetOrderCustomLineItemShippingDetails",
                 "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "ProductDiscountValueInput",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "relative",
+              "name": "setCustomType",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "RelativeDiscountValueInput",
+                "name": "SetOrderCustomType",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "absolute",
+              "name": "setCustomerEmail",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "AbsoluteDiscountValueInput",
+                "name": "SetOrderCustomerEmail",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "external",
+              "name": "setCustomerId",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ExternalDiscountValueInput",
+                "name": "SetOrderCustomerId",
                 "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "ProductDraft",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "name",
+              "name": "setDeliveryAddress",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "LocalizedStringItemInputType",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderDeliveryAddress",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "productType",
+              "name": "setDeliveryItems",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "ResourceIdentifierInput",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderDeliveryItems",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "slug",
+              "name": "setLineItemCustomField",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "LocalizedStringItemInputType",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderLineItemCustomField",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "key",
+              "name": "setLineItemCustomType",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderLineItemCustomType",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "description",
+              "name": "setLineItemShippingDetails",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderLineItemShippingDetails",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "categories",
+              "name": "setLocale",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "ResourceIdentifierInput",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderLocale",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "categoryOrderHints",
+              "name": "setOrderNumber",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "CategoryOrderHintInput",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderNumber",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "metaTitle",
+              "name": "setParcelItems",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderParcelItems",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "metaDescription",
+              "name": "setParcelMeasurements",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderParcelMeasurements",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "metaKeywords",
+              "name": "setParcelTrackingData",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderParcelTrackingData",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "masterVariant",
+              "name": "setReturnPaymentState",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ProductVariantInput",
+                "name": "SetOrderReturnPaymentState",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "variants",
+              "name": "setReturnShipmentState",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "ProductVariantInput",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetOrderReturnShipmentState",
+                "ofType": null
               },
-              "defaultValue": "[]"
+              "defaultValue": null
             },
             {
-              "name": "taxCategory",
+              "name": "setShippingAddress",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "SetOrderShippingAddress",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "state",
+              "name": "transitionCustomLineItemState",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ResourceIdentifierInput",
+                "name": "TransitionOrderCustomLineItemState",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "searchKeywords",
+              "name": "transitionLineItemState",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "SearchKeywordInput",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "TransitionOrderLineItemState",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "publish",
+              "name": "transitionState",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
+                "kind": "INPUT_OBJECT",
+                "name": "TransitionOrderState",
                 "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "ProductPriceDataInput",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "value",
+              "name": "updateItemShippingAddress",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "BaseMoneyInput",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "UpdateOrderItemShippingAddress",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "country",
+              "name": "updateSyncInfo",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Country",
+                "kind": "INPUT_OBJECT",
+                "name": "UpdateOrderSyncInfo",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ParcelMeasurementsDraftType",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "customerGroup",
+              "name": "heightInMillimeter",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "kind": "SCALAR",
+                "name": "Int",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "channel",
+              "name": "lengthInMillimeter",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "kind": "SCALAR",
+                "name": "Int",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "validFrom",
+              "name": "widthInMillimeter",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "DateTime",
+                "name": "Int",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "validUntil",
+              "name": "weightInGram",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "DateTime",
+                "name": "Int",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "PlainEnumValue",
+          "description": null,
+          "fields": [
             {
-              "name": "tiers",
+              "name": "key",
               "description": null,
+              "args": [],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "ProductPriceTierInput",
-                    "ofType": null
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
-              "defaultValue": "[]"
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "custom",
+              "name": "label",
               "description": null,
+              "args": [],
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "CustomFieldsDraft",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
-          "interfaces": null,
+          "inputFields": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ProductPriceTierInput",
+          "name": "PlainEnumValueDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "minimumQuantity",
+              "name": "key",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "value",
+              "name": "label",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "BaseMoneyInput",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -15886,11 +17306,35 @@
         },
         {
           "kind": "OBJECT",
-          "name": "ProductReferenceIdentifier",
+          "name": "PlainEnumValueResult",
           "description": null,
           "fields": [
             {
-              "name": "typeId",
+              "name": "limit",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "offset",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "total",
               "description": null,
               "args": [],
               "type": {
@@ -15898,7 +17342,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -15906,25 +17350,68 @@
               "deprecationReason": null
             },
             {
-              "name": "id",
+              "name": "results",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "PlainEnumValue",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "PriceFunction",
+          "description": null,
+          "fields": [
+            {
+              "name": "function",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "key",
+              "name": "currencyCode",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Currency",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -15937,12 +17424,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ProductTypeDraft",
+          "name": "PriceFunctionDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "name",
+              "name": "function",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -15956,43 +17443,54 @@
               "defaultValue": null
             },
             {
-              "name": "description",
+              "name": "currencyCode",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Currency",
                   "ofType": null
                 }
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ProductAttributeInput",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "key",
+              "name": "name",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "attributeDefinitions",
+              "name": "value",
               "description": null,
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "AttributeDefinitionDraft",
-                    "ofType": null
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "defaultValue": null
@@ -16004,196 +17502,239 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ProductTypeUpdateAction",
+          "name": "ProductDiscountDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "setKey",
+              "name": "value",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "setKey",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ProductDiscountValueInput",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "changeName",
+              "name": "predicate",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "changeName",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "changeDescription",
+              "name": "sortOrder",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "changeDescription",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "removeAttributeDefinition",
+              "name": "name",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "removeAttributeDefinition",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "LocalizedStringItemInputType",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "changeLabel",
+              "name": "description",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "changeLabel",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "setInputTip",
+              "name": "validFrom",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "setInputTip",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeIsSearchable",
+              "name": "validUntil",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "changeIsSearchable",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeInputHint",
+              "name": "isActive",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "changeInputHint",
+                "kind": "SCALAR",
+                "name": "Boolean",
                 "ofType": null
               },
-              "defaultValue": null
+              "defaultValue": "true"
             },
             {
-              "name": "addAttributeDefinition",
+              "name": "key",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "addAttributeDefinition",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ProductDiscountUpdateAction",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "changeAttributeOrder",
+              "name": "changeIsActive",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "changeAttributeOrder",
+                "name": "ChangeProductDiscountIsActive",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "removeEnumValues",
+              "name": "changeName",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "removeEnumValues",
+                "name": "ChangeProductDiscountName",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "addPlainEnumValue",
+              "name": "changePredicate",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "addPlainEnumValue",
+                "name": "ChangeProductDiscountPredicate",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changePlainEnumValueLabel",
+              "name": "changeSortOrder",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "changePlainEnumValueLabel",
+                "name": "ChangeProductDiscountSortOrder",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changePlainEnumValueOrder",
+              "name": "changeValue",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "changePlainEnumValueOrder",
+                "name": "ChangeProductDiscountValue",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "addLocalizedEnumValue",
+              "name": "setDescription",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "addLocalizedEnumValue",
+                "name": "SetProductDiscountDescription",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeLocalizedEnumValueLabel",
+              "name": "setKey",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "changeLocalizedEnumValueLabel",
+                "name": "SetProductDiscountKey",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeLocalizedEnumValueOrder",
+              "name": "setValidFrom",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "changeLocalizedEnumValueOrder",
+                "name": "SetProductDiscountValidFrom",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeAttributeName",
+              "name": "setValidFromAndUntil",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "changeAttributeName",
+                "name": "SetProductDiscountValidFromAndUntil",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeEnumKey",
+              "name": "setValidUntil",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "changeEnumKey",
+                "name": "SetProductDiscountValidUntil",
                 "ofType": null
               },
               "defaultValue": null
@@ -16205,476 +17746,770 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ProductUpdateAction",
+          "name": "ProductDiscountValueInput",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "moveImageToPosition",
+              "name": "relative",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "MoveProductImageToPosition",
+                "name": "RelativeDiscountValueInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setSearchKeywords",
+              "name": "absolute",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetSearchKeywords",
+                "name": "AbsoluteDiscountValueInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "revertStagedChanges",
+              "name": "external",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "RevertStagedChanges",
+                "name": "ExternalDiscountValueInput",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ProductDraft",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "revertStagedVariantChanges",
+              "name": "name",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "RevertStagedVariantChanges",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "LocalizedStringItemInputType",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "publish",
+              "name": "productType",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "PublishProduct",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "unpublish",
+              "name": "slug",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "UnpublishProduct",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "LocalizedStringItemInputType",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "transitionState",
+              "name": "key",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "TransitionProductState",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "addAsset",
+              "name": "description",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "AddProductAsset",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "addExternalImage",
+              "name": "categories",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "AddProductExternalImage",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ResourceIdentifierInput",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "addPrice",
+              "name": "categoryOrderHints",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "AddProductPrice",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CategoryOrderHintInput",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "addToCategory",
+              "name": "metaTitle",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "AddProductToCategory",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "addVariant",
+              "name": "metaDescription",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "AddProductVariant",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "changeAssetName",
+              "name": "metaKeywords",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ChangeProductAssetName",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "changeAssetOrder",
+              "name": "masterVariant",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeProductAssetOrder",
+                "name": "ProductVariantInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeMasterVariant",
+              "name": "variants",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ProductVariantInput",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": "[]"
+            },
+            {
+              "name": "taxCategory",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeProductMasterVariant",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeImageLabel",
+              "name": "state",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeProductImageLabel",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeName",
+              "name": "searchKeywords",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ChangeProductName",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "SearchKeywordInput",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "changePrice",
+              "name": "publish",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ChangeProductPrice",
+                "kind": "SCALAR",
+                "name": "Boolean",
                 "ofType": null
               },
               "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ProductPriceDataInput",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "value",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "BaseMoneyInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
             },
             {
-              "name": "changeSlug",
+              "name": "country",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ChangeProductSlug",
+                "kind": "SCALAR",
+                "name": "Country",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "removeAsset",
+              "name": "customerGroup",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "RemoveProductAsset",
+                "name": "ReferenceInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "removeFromCategory",
+              "name": "channel",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "RemoveProductFromCategory",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "removeImage",
+              "name": "validFrom",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "RemoveProductImage",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "removePrice",
+              "name": "validUntil",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "RemoveProductPrice",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "removeVariant",
+              "name": "tiers",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ProductPriceTierInput",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": "[]"
+            },
+            {
+              "name": "custom",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "RemoveProductVariant",
+                "name": "CustomFieldsDraft",
                 "ofType": null
               },
               "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ProductPriceTierInput",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "minimumQuantity",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
             },
             {
-              "name": "setAssetCustomField",
+              "name": "value",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "SetProductAssetCustomField",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "BaseMoneyInput",
+                  "ofType": null
+                }
               },
               "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "ProductReferenceIdentifier",
+          "description": null,
+          "fields": [
+            {
+              "name": "typeId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "setAssetCustomType",
+              "name": "id",
               "description": null,
+              "args": [],
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "SetProductAssetCustomType",
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ProductTypeDraft",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "name",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
               "defaultValue": null
             },
             {
-              "name": "setAssetDescription",
+              "name": "description",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "SetProductAssetDescription",
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setAssetKey",
+              "name": "attributeDefinitions",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "AttributeDefinitionDraft",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ProductTypeUpdateAction",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "setKey",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductAssetKey",
+                "name": "setKey",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setAssetSources",
+              "name": "changeName",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductAssetSources",
+                "name": "changeName",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setAssetTags",
+              "name": "changeDescription",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductAssetTags",
+                "name": "changeDescription",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setCategoryOrderHint",
+              "name": "removeAttributeDefinition",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductCategoryOrderHint",
+                "name": "removeAttributeDefinition",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setDiscountedPrice",
+              "name": "changeLabel",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductDiscountedPrice",
+                "name": "changeLabel",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setAttribute",
+              "name": "setInputTip",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductAttribute",
+                "name": "setInputTip",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setAttributeInAllVariants",
+              "name": "changeIsSearchable",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductAttributeInAllVariants",
+                "name": "changeIsSearchable",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setDescription",
+              "name": "changeInputHint",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductDescription",
+                "name": "changeInputHint",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setImageLabel",
+              "name": "addAttributeDefinition",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductImageLabel",
+                "name": "addAttributeDefinition",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setKey",
+              "name": "changeAttributeOrder",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductKey",
+                "name": "changeAttributeOrder",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setMetaAttributes",
+              "name": "changeAttributeOrderByName",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductMetaAttributes",
+                "name": "changeAttributeOrderByName",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setMetaDescription",
+              "name": "removeEnumValues",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductMetaDescription",
+                "name": "removeEnumValues",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setMetaKeywords",
+              "name": "addPlainEnumValue",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductMetaKeywords",
+                "name": "addPlainEnumValue",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setMetaTitle",
+              "name": "changePlainEnumValueLabel",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductMetaTitle",
+                "name": "changePlainEnumValueLabel",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setProductPriceCustomField",
+              "name": "changePlainEnumValueOrder",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductPriceCustomField",
+                "name": "changePlainEnumValueOrder",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setProductPriceCustomType",
+              "name": "addLocalizedEnumValue",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductPriceCustomType",
+                "name": "addLocalizedEnumValue",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setPrices",
+              "name": "changeLocalizedEnumValueLabel",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductPrices",
+                "name": "changeLocalizedEnumValueLabel",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setSku",
+              "name": "changeLocalizedEnumValueOrder",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductSku",
+                "name": "changeLocalizedEnumValueOrder",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setTaxCategory",
+              "name": "changeAttributeName",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductTaxCategory",
+                "name": "changeAttributeName",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setProductVariantKey",
+              "name": "changeEnumKey",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetProductVariantKey",
+                "name": "changeEnumKey",
                 "ofType": null
               },
               "defaultValue": null
@@ -16686,68 +18521,549 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ProductVariantInput",
+          "name": "ProductUpdateAction",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "sku",
+              "name": "moveImageToPosition",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "MoveProductImageToPosition",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "key",
+              "name": "setSearchKeywords",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "SetSearchKeywords",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "prices",
+              "name": "revertStagedChanges",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "ProductPriceDataInput",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "RevertStagedChanges",
+                "ofType": null
               },
-              "defaultValue": "[]"
+              "defaultValue": null
             },
             {
-              "name": "images",
+              "name": "revertStagedVariantChanges",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "ImageInput",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "RevertStagedVariantChanges",
+                "ofType": null
               },
-              "defaultValue": "[]"
+              "defaultValue": null
             },
             {
-              "name": "attributes",
+              "name": "publish",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "PublishProduct",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "unpublish",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "UnpublishProduct",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "transitionState",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "TransitionProductState",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "addAsset",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "AddProductAsset",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "addExternalImage",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "AddProductExternalImage",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "addPrice",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "AddProductPrice",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "addToCategory",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "AddProductToCategory",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "addVariant",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "AddProductVariant",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "changeAssetName",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeProductAssetName",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "changeAssetOrder",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeProductAssetOrder",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "changeMasterVariant",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeProductMasterVariant",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "changeImageLabel",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeProductImageLabel",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "changeName",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeProductName",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "changePrice",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeProductPrice",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "changeSlug",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeProductSlug",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "removeAsset",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "RemoveProductAsset",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "removeFromCategory",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "RemoveProductFromCategory",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "removeImage",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "RemoveProductImage",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "removePrice",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "RemoveProductPrice",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "removeVariant",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "RemoveProductVariant",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setAssetCustomField",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductAssetCustomField",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setAssetCustomType",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductAssetCustomType",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setAssetDescription",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductAssetDescription",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setAssetKey",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductAssetKey",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setAssetSources",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductAssetSources",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setAssetTags",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductAssetTags",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setCategoryOrderHint",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductCategoryOrderHint",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setDiscountedPrice",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductDiscountedPrice",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setAttribute",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductAttribute",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setAttributeInAllVariants",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductAttributeInAllVariants",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setDescription",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductDescription",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setImageLabel",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductImageLabel",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setKey",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductKey",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setMetaAttributes",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductMetaAttributes",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setMetaDescription",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductMetaDescription",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setMetaKeywords",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductMetaKeywords",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setMetaTitle",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductMetaTitle",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setProductPriceCustomField",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductPriceCustomField",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setProductPriceCustomType",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductPriceCustomType",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setPrices",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductPrices",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setSku",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductSku",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setTaxCategory",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductTaxCategory",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setProductVariantKey",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProductVariantKey",
+                "ofType": null
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ProductVariantInput",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "prices",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ProductPriceDataInput",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": "[]"
+            },
+            {
+              "name": "images",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ImageInput",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": "[]"
+            },
+            {
+              "name": "attributes",
               "description": null,
               "type": {
                 "kind": "LIST",
@@ -16853,6 +19169,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "setExternalOAuth",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetProjectSettingsExternalOAuth",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "setShippingRateInputType",
               "description": null,
@@ -17577,19 +19903,19 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "RemoveInventoryEntryQuantity",
+          "name": "RemoveCustomerStore",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "quantity",
+              "name": "store",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
                   "ofType": null
                 }
               },
@@ -17602,19 +19928,119 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "RemoveLocation",
+          "name": "RemoveInventoryEntryQuantity",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "location",
+              "name": "quantity",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "RemoveOrderDelivery",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "deliveryId",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "RemoveOrderItemShippingAddress",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "addressKey",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "RemoveOrderParcelFromDelivery",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "parcelId",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "RemoveOrderPayment",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "payment",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "ZoneLocation",
+                  "name": "ResourceIdentifierInput",
                   "ofType": null
                 }
               },
@@ -17912,7 +20338,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "ReferenceInput",
+                  "name": "ResourceIdentifierInput",
                   "ofType": null
                 }
               },
@@ -17951,7 +20377,32 @@
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "ReferenceInput",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "RemoveZoneLocation",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "location",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ZoneLocation",
                   "ofType": null
                 }
               },
@@ -18003,6 +20454,75 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ReturnItemDraftType",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "quantity",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "lineItemId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "customLineItemId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "comment",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "shipmentState",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnShipmentState",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "RevertStagedChanges",
@@ -18606,7 +21126,7 @@
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -18892,6 +21412,27 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetCartDiscountKey",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "SetCartDiscountValidFrom",
@@ -19315,7 +21856,7 @@
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -20489,251 +23030,27 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetCustomerTitle",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "title",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetCustomerVatId",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "vatId",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeCartPredicate",
+          "name": "SetCustomerStores",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "cartPredicate",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeCustomField",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "name",
+              "name": "stores",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "value",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeCustomType",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "fields",
-              "description": null,
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "CustomFieldInput",
-                    "ofType": null
-                  }
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "type",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ResourceIdentifierInput",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "typeKey",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "typeId",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeDescription",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "description",
-              "description": null,
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeMaxApplications",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "maxApplications",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Long",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeMaxApplicationsPerCustomer",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "maxApplicationsPerCustomer",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Long",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeName",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "name",
-              "description": null,
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
+                  "kind": "LIST",
                   "name": null,
                   "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "ResourceIdentifierInput",
+                      "ofType": null
+                    }
                   }
                 }
               },
@@ -20746,16 +23063,16 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeValidFrom",
+          "name": "SetCustomerTitle",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "validFrom",
+              "name": "title",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "DateTime",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
@@ -20767,26 +23084,16 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeValidFromAndUntil",
+          "name": "SetCustomerVatId",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "validFrom",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "validUntil",
+              "name": "vatId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "DateTime",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
@@ -20798,16 +23105,16 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetDiscountCodeValidUntil",
+          "name": "SetDiscountCodeCartPredicate",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "validUntil",
+              "name": "cartPredicate",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "DateTime",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
@@ -20819,7 +23126,7 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetInventoryEntryCustomField",
+          "name": "SetDiscountCodeCustomField",
           "description": null,
           "fields": null,
           "inputFields": [
@@ -20854,16 +23161,34 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetInventoryEntryCustomType",
+          "name": "SetDiscountCodeCustomType",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "typeId",
+              "name": "fields",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CustomFieldInput",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "type",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -20879,17 +23204,28 @@
               "defaultValue": null
             },
             {
-              "name": "type",
+              "name": "typeId",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ResourceIdentifierInput",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetDiscountCodeDescription",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "fields",
+              "name": "description",
               "description": null,
               "type": {
                 "kind": "LIST",
@@ -20899,7 +23235,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "INPUT_OBJECT",
-                    "name": "CustomFieldInput",
+                    "name": "LocalizedStringItemInputType",
                     "ofType": null
                   }
                 }
@@ -20913,16 +23249,16 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetInventoryEntryExpectedDelivery",
+          "name": "SetDiscountCodeMaxApplications",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "expectedDelivery",
+              "name": "maxApplications",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "DateTime",
+                "name": "Long",
                 "ofType": null
               },
               "defaultValue": null
@@ -20934,16 +23270,16 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetInventoryEntryRestockableInDays",
+          "name": "SetDiscountCodeMaxApplicationsPerCustomer",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "restockableInDays",
+              "name": "maxApplicationsPerCustomer",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "Long",
                 "ofType": null
               },
               "defaultValue": null
@@ -20955,17 +23291,25 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetInventoryEntrySupplyChannel",
+          "name": "SetDiscountCodeName",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "supplyChannel",
+              "name": "name",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             }
@@ -20976,16 +23320,16 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetMyCartShippingMethod",
+          "name": "SetDiscountCodeValidFrom",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "shippingMethod",
+              "name": "validFrom",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
@@ -20997,60 +23341,62 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductAssetCustomField",
+          "name": "SetDiscountCodeValidFromAndUntil",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
+              "name": "validFrom",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "sku",
+              "name": "validUntil",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "catalog",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
-            },
-            {
-              "name": "staged",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "defaultValue": "true"
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetDiscountCodeValidUntil",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "value",
+              "name": "validUntil",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetInventoryEntryCustomField",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
               "name": "name",
               "description": null,
@@ -21066,17 +23412,7 @@
               "defaultValue": null
             },
             {
-              "name": "assetKey",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "assetId",
+              "name": "value",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -21092,50 +23428,10 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductAssetCustomType",
+          "name": "SetInventoryEntryCustomType",
           "description": null,
           "fields": null,
           "inputFields": [
-            {
-              "name": "variantId",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "sku",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "catalog",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "staged",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "defaultValue": "true"
-            },
             {
               "name": "typeId",
               "description": null,
@@ -21183,23 +23479,45 @@
                 }
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetInventoryEntryExpectedDelivery",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "assetKey",
+              "name": "expectedDelivery",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetInventoryEntryRestockableInDays",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "assetId",
+              "name": "restockableInDays",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Int",
                 "ofType": null
               },
               "defaultValue": null
@@ -21211,80 +23529,138 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductAssetDescription",
+          "name": "SetInventoryEntrySupplyChannel",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
+              "name": "supplyChannel",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "INPUT_OBJECT",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetMyCartShippingMethod",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "sku",
+              "name": "shippingMethod",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderBillingAddress",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "catalog",
+              "name": "address",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "AddressInput",
                 "ofType": null
               },
               "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderCustomField",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "name",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "value",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderCustomLineItemCustomField",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "description",
+              "name": "customLineItemId",
               "description": null,
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "assetKey",
+              "name": "name",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "assetId",
+              "name": "value",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -21300,52 +23676,64 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductAssetKey",
+          "name": "SetOrderCustomLineItemCustomType",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
+              "name": "customLineItemId",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "sku",
+              "name": "fields",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CustomFieldInput",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "catalog",
+              "name": "type",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "typeKey",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
             },
             {
-              "name": "assetKey",
+              "name": "typeId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -21353,9 +23741,20 @@
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderCustomLineItemShippingDetails",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "assetId",
+              "name": "customLineItemId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -21367,6 +23766,16 @@
                 }
               },
               "defaultValue": null
+            },
+            {
+              "name": "shippingDetails",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ItemShippingDetailsDraftType",
+                "ofType": null
+              },
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -21375,70 +23784,71 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductAssetSources",
+          "name": "SetOrderCustomType",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
+              "name": "fields",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CustomFieldInput",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "sku",
+              "name": "type",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "catalog",
+              "name": "typeKey",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "typeId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
-            },
-            {
-              "name": "sources",
-              "description": null,
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "AssetSourceInput",
-                    "ofType": null
-                  }
-                }
-              },
-              "defaultValue": "[]"
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderCustomerEmail",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "assetKey",
+              "name": "email",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -21446,9 +23856,20 @@
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderCustomerId",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "assetId",
+              "name": "customerId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -21464,86 +23885,79 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductAssetTags",
+          "name": "SetOrderDeliveryAddress",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
+              "name": "deliveryId",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "sku",
+              "name": "address",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "AddressInput",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderDeliveryItems",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "catalog",
+              "name": "deliveryId",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "staged",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "defaultValue": "true"
-            },
-            {
-              "name": "tags",
+              "name": "items",
               "description": null,
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
+                  "kind": "LIST",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "DeliveryItemDraftType",
+                      "ofType": null
+                    }
                   }
                 }
               },
-              "defaultValue": "[]"
-            },
-            {
-              "name": "assetKey",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "assetId",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
               "defaultValue": null
             }
           ],
@@ -21553,27 +23967,21 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductAttribute",
+          "name": "SetOrderLineItemCustomField",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "sku",
+              "name": "lineItemId",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
@@ -21600,16 +24008,6 @@
                 "ofType": null
               },
               "defaultValue": null
-            },
-            {
-              "name": "staged",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "defaultValue": "true"
             }
           ],
           "interfaces": null,
@@ -21618,12 +24016,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductAttributeInAllVariants",
+          "name": "SetOrderLineItemCustomType",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "name",
+              "name": "lineItemId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -21637,7 +24035,35 @@
               "defaultValue": null
             },
             {
-              "name": "value",
+              "name": "fields",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CustomFieldInput",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "type",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ResourceIdentifierInput",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "typeKey",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -21647,14 +24073,14 @@
               "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "typeId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -21663,12 +24089,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductCategoryOrderHint",
+          "name": "SetOrderLineItemShippingDetails",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "categoryId",
+              "name": "lineItemId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -21682,24 +24108,35 @@
               "defaultValue": null
             },
             {
-              "name": "orderHint",
+              "name": "shippingDetails",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "ItemShippingDetailsDraftType",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderLocale",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "staged",
+              "name": "locale",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "Locale",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -21708,37 +24145,19 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductDescription",
+          "name": "SetOrderNumber",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "description",
-              "description": null,
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "staged",
+              "name": "orderNumber",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -21747,23 +24166,41 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductDiscountDescription",
+          "name": "SetOrderParcelItems",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "description",
+              "name": "parcelId",
               "description": null,
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "items",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
                   "name": null,
                   "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "DeliveryItemDraftType",
+                      "ofType": null
+                    }
                   }
                 }
               },
@@ -21776,16 +24213,30 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductDiscountValidFrom",
+          "name": "SetOrderParcelMeasurements",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "validFrom",
+              "name": "parcelId",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "measurements",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ParcelMeasurementsDraftType",
                 "ofType": null
               },
               "defaultValue": null
@@ -21797,26 +24248,30 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductDiscountValidFromAndUntil",
+          "name": "SetOrderParcelTrackingData",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "validFrom",
+              "name": "parcelId",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "validUntil",
+              "name": "trackingData",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
+                "kind": "INPUT_OBJECT",
+                "name": "TrackingDataDraftType",
                 "ofType": null
               },
               "defaultValue": null
@@ -21828,17 +24283,35 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductDiscountValidUntil",
+          "name": "SetOrderReturnPaymentState",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "validUntil",
+              "name": "returnItemId",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "paymentState",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnPaymentState",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             }
@@ -21849,12 +24322,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductDiscountedPrice",
+          "name": "SetOrderReturnShipmentState",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "priceId",
+              "name": "returnItemId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -21868,34 +24341,39 @@
               "defaultValue": null
             },
             {
-              "name": "discounted",
+              "name": "shipmentState",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "DiscountedProductPriceValueInput",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnShipmentState",
+                  "ofType": null
+                }
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetOrderShippingAddress",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "catalog",
+              "name": "address",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "name": "AddressInput",
                 "ofType": null
               },
               "defaultValue": null
-            },
-            {
-              "name": "staged",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "defaultValue": "true"
             }
           ],
           "interfaces": null,
@@ -21904,7 +24382,7 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductImageLabel",
+          "name": "SetProductAssetCustomField",
           "description": null,
           "fields": null,
           "inputFields": [
@@ -21929,7 +24407,37 @@
               "defaultValue": null
             },
             {
-              "name": "imageUrl",
+              "name": "catalog",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
+            },
+            {
+              "name": "value",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "name",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -21943,7 +24451,7 @@
               "defaultValue": null
             },
             {
-              "name": "label",
+              "name": "assetKey",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -21953,28 +24461,7 @@
               "defaultValue": null
             },
             {
-              "name": "staged",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "defaultValue": "true"
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetProductKey",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "key",
+              "name": "assetId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -21990,61 +24477,37 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductMetaAttributes",
+          "name": "SetProductAssetCustomType",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "metaDescription",
+              "name": "variantId",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "metaKeywords",
+              "name": "sku",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "metaTitle",
+              "name": "catalog",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
               },
               "defaultValue": null
             },
@@ -22057,59 +24520,39 @@
                 "ofType": null
               },
               "defaultValue": "true"
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetProductMetaDescription",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "metaDescription",
+              "name": "typeId",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "typeKey",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetProductMetaKeywords",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+              "defaultValue": null
+            },
             {
-              "name": "metaKeywords",
+              "name": "type",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ResourceIdentifierInput",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "fields",
               "description": null,
               "type": {
                 "kind": "LIST",
@@ -22119,7 +24562,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
+                    "name": "CustomFieldInput",
                     "ofType": null
                   }
                 }
@@ -22127,14 +24570,24 @@
               "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "assetKey",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
+            },
+            {
+              "name": "assetId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -22143,19 +24596,59 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductMetaTitle",
+          "name": "SetProductAssetDescription",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "metaTitle",
+              "name": "variantId",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "catalog",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
+            },
+            {
+              "name": "description",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
                   "ofType": {
                     "kind": "INPUT_OBJECT",
                     "name": "LocalizedStringItemInputType",
@@ -22166,14 +24659,24 @@
               "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "assetKey",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
+            },
+            {
+              "name": "assetId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -22182,21 +24685,27 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductPriceCustomField",
+          "name": "SetProductAssetKey",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "priceId",
+              "name": "variantId",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             },
@@ -22221,7 +24730,17 @@
               "defaultValue": "true"
             },
             {
-              "name": "name",
+              "name": "assetKey",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "assetId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -22233,16 +24752,6 @@
                 }
               },
               "defaultValue": null
-            },
-            {
-              "name": "value",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -22251,21 +24760,27 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductPriceCustomType",
+          "name": "SetProductAssetSources",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "priceId",
+              "name": "variantId",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             },
@@ -22290,7 +24805,7 @@
               "defaultValue": "true"
             },
             {
-              "name": "fields",
+              "name": "sources",
               "description": null,
               "type": {
                 "kind": "LIST",
@@ -22300,25 +24815,15 @@
                   "name": null,
                   "ofType": {
                     "kind": "INPUT_OBJECT",
-                    "name": "CustomFieldInput",
+                    "name": "AssetSourceInput",
                     "ofType": null
                   }
                 }
               },
-              "defaultValue": null
-            },
-            {
-              "name": "type",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ResourceIdentifierInput",
-                "ofType": null
-              },
-              "defaultValue": null
+              "defaultValue": "[]"
             },
             {
-              "name": "typeKey",
+              "name": "assetKey",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -22328,7 +24833,7 @@
               "defaultValue": null
             },
             {
-              "name": "typeId",
+              "name": "assetId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -22344,7 +24849,7 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductPrices",
+          "name": "SetProductAssetTags",
           "description": null,
           "fields": null,
           "inputFields": [
@@ -22369,46 +24874,62 @@
               "defaultValue": null
             },
             {
-              "name": "prices",
+              "name": "catalog",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
+            },
+            {
+              "name": "tags",
+              "description": null,
+              "type": {
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
+                  "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "ProductPriceDataInput",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   }
                 }
               },
-              "defaultValue": null
+              "defaultValue": "[]"
             },
             {
-              "name": "catalog",
+              "name": "assetKey",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "staged",
+              "name": "assetId",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "Boolean",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": "true"
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -22417,26 +24938,46 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductSku",
+          "name": "SetProductAttribute",
           "description": null,
           "fields": null,
           "inputFields": [
             {
               "name": "variantId",
               "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "name",
+              "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "sku",
+              "name": "value",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -22462,53 +25003,26 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProductTaxCategory",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "taxCategory",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ReferenceInput",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "SetProductVariantKey",
+          "name": "SetProductAttributeInAllVariants",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "variantId",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "sku",
+              "name": "name",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "key",
+              "name": "value",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -22534,19 +25048,43 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetProjectSettingsShippingRateInputType",
+          "name": "SetProductCategoryOrderHint",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "shippingRateInputType",
+              "name": "categoryId",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ShippingRateInputTypeInput",
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "orderHint",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
+            },
+            {
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
             }
           ],
           "interfaces": null,
@@ -22555,27 +25093,23 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetSearchKeywords",
+          "name": "SetProductDescription",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "searchKeywords",
+              "name": "description",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
+                  "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "SearchKeywordInput",
-                      "ofType": null
-                    }
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
                   }
                 }
               },
@@ -22589,7 +25123,7 @@
                 "name": "Boolean",
                 "ofType": null
               },
-              "defaultValue": null
+              "defaultValue": "true"
             }
           ],
           "interfaces": null,
@@ -22598,7 +25132,7 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetShippingMethodDescription",
+          "name": "SetProductDiscountDescription",
           "description": null,
           "fields": null,
           "inputFields": [
@@ -22606,9 +25140,17 @@
               "name": "description",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
               "defaultValue": null
             }
@@ -22619,7 +25161,7 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetShippingMethodKey",
+          "name": "SetProductDiscountKey",
           "description": null,
           "fields": null,
           "inputFields": [
@@ -22640,16 +25182,16 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetShippingMethodPredicate",
+          "name": "SetProductDiscountValidFrom",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "predicate",
+              "name": "validFrom",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
@@ -22661,86 +25203,47 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetTaxCategoryKey",
+          "name": "SetProductDiscountValidFromAndUntil",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "key",
+              "name": "validFrom",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "SetType",
-          "description": null,
-          "fields": [
-            {
-              "name": "elementType",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "FieldType",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "validUntil",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "FieldType",
-              "ofType": null
+              "defaultValue": null
             }
           ],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SetZoneDescription",
+          "name": "SetProductDiscountValidUntil",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "description",
+              "name": "validUntil",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "DateTime",
                 "ofType": null
               },
               "defaultValue": null
@@ -22752,12 +25255,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ShippingMethodDraft",
+          "name": "SetProductDiscountedPrice",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "name",
+              "name": "priceId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -22771,63 +25274,82 @@
               "defaultValue": null
             },
             {
-              "name": "description",
+              "name": "discounted",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "DiscountedProductPriceValueInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "taxCategory",
+              "name": "catalog",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "ResourceIdentifierInput",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "zoneRates",
+              "name": "staged",
               "description": null,
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "ZoneRateDraft",
-                    "ofType": null
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
               },
-              "defaultValue": "[]"
+              "defaultValue": "true"
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetProductImageLabel",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "variantId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "defaultValue": null
             },
             {
-              "name": "isDefault",
+              "name": "sku",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "imageUrl",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
+                  "name": "String",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "predicate",
+              "name": "label",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -22837,14 +25359,14 @@
               "defaultValue": null
             },
             {
-              "name": "key",
+              "name": "staged",
               "description": null,
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Boolean",
                 "ofType": null
               },
-              "defaultValue": null
+              "defaultValue": "true"
             }
           ],
           "interfaces": null,
@@ -22852,220 +25374,261 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "ShippingRateCartClassificationPriceTier",
+          "kind": "INPUT_OBJECT",
+          "name": "SetProductKey",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "value",
+              "name": "key",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetProductMetaAttributes",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "price",
+              "name": "metaDescription",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Money",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "isMatching",
+              "name": "metaKeywords",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "type",
+              "name": "metaTitle",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
+              "defaultValue": null
+            },
             {
-              "kind": "INTERFACE",
-              "name": "ShippingRatePriceTier",
-              "ofType": null
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
             }
           ],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "ShippingRateCartScorePriceTier",
+          "kind": "INPUT_OBJECT",
+          "name": "SetProductMetaDescription",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "score",
+              "name": "metaDescription",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "price",
+              "name": "staged",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Money",
+                "kind": "SCALAR",
+                "name": "Boolean",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": "true"
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetProductMetaKeywords",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "priceFunction",
+              "name": "metaKeywords",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "PriceFunction",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "isMatching",
+              "name": "staged",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "Boolean",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": "true"
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetProductMetaTitle",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "type",
+              "name": "metaTitle",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
+              "defaultValue": null
+            },
             {
-              "kind": "INTERFACE",
-              "name": "ShippingRatePriceTier",
-              "ofType": null
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
             }
           ],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "ShippingRateCartValuePriceTier",
+          "kind": "INPUT_OBJECT",
+          "name": "SetProductPriceCustomField",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "minimumCentAmount",
+              "name": "priceId",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "price",
+              "name": "catalog",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Money",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "ReferenceInput",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "isMatching",
+              "name": "staged",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "Boolean",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": "true"
             },
             {
-              "name": "type",
+              "name": "name",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -23075,53 +25638,65 @@
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
+              "defaultValue": null
+            },
             {
-              "kind": "INTERFACE",
-              "name": "ShippingRatePriceTier",
-              "ofType": null
+              "name": "value",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
             }
           ],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ShippingRateDraft",
+          "name": "SetProductPriceCustomType",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "price",
+              "name": "priceId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "MoneyDraft",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "freeAbove",
+              "name": "catalog",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "MoneyDraft",
+                "name": "ReferenceInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "tiers",
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
+            },
+            {
+              "name": "fields",
               "description": null,
               "type": {
                 "kind": "LIST",
@@ -23131,40 +25706,39 @@
                   "name": null,
                   "ofType": {
                     "kind": "INPUT_OBJECT",
-                    "name": "ShippingRatePriceTierDraft",
+                    "name": "CustomFieldInput",
                     "ofType": null
                   }
                 }
               },
-              "defaultValue": "[]"
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "ShippingRateInputDraft",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+              "defaultValue": null
+            },
             {
-              "name": "Classification",
+              "name": "type",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ClassificationShippingRateInputDraft",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "Score",
+              "name": "typeKey",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ScoreShippingRateInputDraft",
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "typeId",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
@@ -23175,71 +25749,34 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "ShippingRateInputLocalizedEnumValue",
+          "kind": "INPUT_OBJECT",
+          "name": "SetProductPrices",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "key",
+              "name": "variantId",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "label",
+              "name": "sku",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "labelAllLocales",
+              "name": "prices",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -23250,57 +25787,34 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "LocalizedString",
+                      "kind": "INPUT_OBJECT",
+                      "name": "ProductPriceDataInput",
                       "ofType": null
                     }
                   }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "ShippingRateInputTypeInput",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "CartValue",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "CartValueInput",
-                "ofType": null
-              },
               "defaultValue": null
             },
             {
-              "name": "CartClassification",
+              "name": "catalog",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "CartClassificationInput",
+                "name": "ReferenceInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "CartScore",
+              "name": "staged",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "CartScoreInput",
+                "kind": "SCALAR",
+                "name": "Boolean",
                 "ofType": null
               },
-              "defaultValue": null
+              "defaultValue": "true"
             }
           ],
           "interfaces": null,
@@ -23309,37 +25823,43 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ShippingRatePriceTierCartClassificationDraft",
+          "name": "SetProductSku",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "value",
+              "name": "variantId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Int",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "price",
+              "name": "sku",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "MoneyDraft",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
+            },
+            {
+              "name": "staged",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "true"
             }
           ],
           "interfaces": null,
@@ -23348,40 +25868,16 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ShippingRatePriceTierCartScoreDraft",
+          "name": "SetProductTaxCategory",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "score",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "price",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "MoneyDraft",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "priceFunction",
+              "name": "taxCategory",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "PriceFunctionDraft",
+                "name": "ResourceIdentifierInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -23393,75 +25889,67 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ShippingRatePriceTierCartValueDraft",
+          "name": "SetProductVariantKey",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "minimumCentAmount",
+              "name": "variantId",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "price",
+              "name": "sku",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "MoneyDraft",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "ShippingRatePriceTierDraft",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "CartValue",
+              "name": "key",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ShippingRatePriceTierCartValueDraft",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "CartClassification",
+              "name": "staged",
               "description": null,
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ShippingRatePriceTierCartClassificationDraft",
+                "kind": "SCALAR",
+                "name": "Boolean",
                 "ofType": null
               },
-              "defaultValue": null
-            },
+              "defaultValue": "true"
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetProjectSettingsExternalOAuth",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "CartScore",
+              "name": "externalOAuth",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ShippingRatePriceTierCartScoreDraft",
+                "name": "ExternalOAuthDraft",
                 "ofType": null
               },
               "defaultValue": null
@@ -23472,69 +25960,61 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "ShippingTarget",
+          "kind": "INPUT_OBJECT",
+          "name": "SetProjectSettingsShippingRateInputType",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "type",
+              "name": "shippingRateInputType",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "ShippingRateInputTypeInput",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "CartDiscountTarget",
-              "ofType": null
+              "defaultValue": null
             }
           ],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ShippingTargetDraft",
+          "name": "SetSearchKeywords",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "addressKey",
+              "name": "searchKeywords",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "SearchKeywordInput",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "quantity",
+              "name": "staged",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -23545,12 +26025,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ShippingTargetInput",
+          "name": "SetShippingMethodDescription",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "dummy",
+              "name": "description",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -23566,12 +26046,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SimpleAttributeTypeDraft",
+          "name": "SetShippingMethodKey",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "dummy",
+              "name": "key",
               "description": null,
               "type": {
                 "kind": "SCALAR",
@@ -23586,69 +26066,91 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "StringAttribute",
+          "kind": "INPUT_OBJECT",
+          "name": "SetShippingMethodPredicate",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "value",
+              "name": "predicate",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetStoreName",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
               "name": "name",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SetTaxCategoryKey",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "kind": "INTERFACE",
-              "name": "Attribute",
-              "ofType": null
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
             }
           ],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "StringField",
+          "name": "SetType",
           "description": null,
           "fields": [
             {
-              "name": "value",
+              "name": "elementType",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "INTERFACE",
+                  "name": "FieldType",
                   "ofType": null
                 }
               },
@@ -23673,39 +26175,6 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "CustomField",
-              "ofType": null
-            }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "StringType",
-          "description": null,
-          "fields": [
-            {
-              "name": "name",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
           "interfaces": [
             {
               "kind": "INTERFACE",
@@ -23718,35 +26187,17 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "SubRateDraft",
+          "name": "SetZoneDescription",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "name",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "amount",
+              "name": "description",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Float",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -23757,21 +26208,17 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "TaxCategoryAddTaxRate",
+          "name": "SetZoneKey",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "taxRate",
+              "name": "key",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "TaxRateDraft",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -23782,7 +26229,7 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "TaxCategoryChangeName",
+          "name": "ShippingMethodDraft",
           "description": null,
           "fields": null,
           "inputFields": [
@@ -23799,44 +26246,33 @@
                 }
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "TaxCategoryDraft",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "name",
+              "name": "description",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "description",
+              "name": "taxCategory",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             },
             {
-              "name": "rates",
+              "name": "zoneRates",
               "description": null,
               "type": {
                 "kind": "LIST",
@@ -23846,84 +26282,44 @@
                   "name": null,
                   "ofType": {
                     "kind": "INPUT_OBJECT",
-                    "name": "TaxRateDraft",
+                    "name": "ZoneRateDraft",
                     "ofType": null
                   }
                 }
               },
-              "defaultValue": null
+              "defaultValue": "[]"
             },
             {
-              "name": "key",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "TaxCategoryRemoveTaxRate",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "taxRateId",
+              "name": "isDefault",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "TaxCategoryReplaceTaxRate",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "taxRateId",
+              "name": "predicate",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "taxRate",
+              "name": "key",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "TaxRateDraft",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -23934,137 +26330,107 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "TaxCategorySetDescription",
+          "name": "ShippingMethodUpdateAction",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "description",
+              "name": "addShippingRate",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "AddShippingMethodShippingRate",
                 "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "TaxCategoryUpdateAction",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "changeName",
+              "name": "addZone",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "TaxCategoryChangeName",
+                "name": "AddShippingMethodZone",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setDescription",
+              "name": "changeIsDefault",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "TaxCategorySetDescription",
+                "name": "ChangeShippingMethodIsDefault",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "addTaxRate",
+              "name": "changeName",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "TaxCategoryAddTaxRate",
+                "name": "ChangeShippingMethodName",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "replaceTaxRate",
+              "name": "changeTaxCategory",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "TaxCategoryReplaceTaxRate",
+                "name": "ChangeShippingMethodTaxCategory",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "removeTaxRate",
+              "name": "removeShippingRate",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "TaxCategoryRemoveTaxRate",
+                "name": "RemoveShippingMethodShippingRate",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setKey",
+              "name": "removeZone",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetTaxCategoryKey",
+                "name": "RemoveShippingMethodZone",
                 "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "TaxPortionDraft",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "name",
+              "name": "setDescription",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "SetShippingMethodDescription",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "rate",
+              "name": "setKey",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Float",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetShippingMethodKey",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "amount",
+              "name": "setPredicate",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "MoneyInput",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetShippingMethodPredicate",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -24074,14 +26440,14 @@
           "possibleTypes": null
         },
         {
-          "kind": "INPUT_OBJECT",
-          "name": "TaxRateDraft",
+          "kind": "OBJECT",
+          "name": "ShippingRateCartClassificationPriceTier",
           "description": null,
-          "fields": null,
-          "inputFields": [
+          "fields": [
             {
-              "name": "name",
+              "name": "value",
               "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -24091,94 +26457,47 @@
                   "ofType": null
                 }
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "amount",
+              "name": "price",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Money",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "isMatching",
               "description": null,
+              "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "Float",
+                "name": "Boolean",
                 "ofType": null
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "includedInPrice",
+              "name": "type",
               "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "country",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Country",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "state",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "subRates",
-              "description": null,
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "SubRateDraft",
-                    "ofType": null
-                  }
-                }
-              },
-              "defaultValue": "[]"
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "TextAttributeDefinitionType",
-          "description": null,
-          "fields": [
-            {
-              "name": "name",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -24190,30 +26509,20 @@
           "interfaces": [
             {
               "kind": "INTERFACE",
-              "name": "AttributeDefinitionType",
+              "name": "ShippingRatePriceTier",
               "ofType": null
             }
           ],
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "SCALAR",
-          "name": "Time",
-          "description": "Time is a scalar value that represents an ISO8601 formatted time.",
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
-          "name": "TimeAttribute",
+          "name": "ShippingRateCartScorePriceTier",
           "description": null,
           "fields": [
             {
-              "name": "value",
+              "name": "score",
               "description": null,
               "args": [],
               "type": {
@@ -24221,7 +26530,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Time",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -24229,40 +26538,43 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "price",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Money",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
+            },
             {
-              "kind": "INTERFACE",
-              "name": "Attribute",
-              "ofType": null
-            }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "TimeAttributeDefinitionType",
-          "description": null,
-          "fields": [
+              "name": "priceFunction",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "PriceFunction",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
-              "name": "name",
+              "name": "isMatching",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "type",
               "description": null,
               "args": [],
               "type": {
@@ -24282,7 +26594,7 @@
           "interfaces": [
             {
               "kind": "INTERFACE",
-              "name": "AttributeDefinitionType",
+              "name": "ShippingRatePriceTier",
               "ofType": null
             }
           ],
@@ -24291,11 +26603,11 @@
         },
         {
           "kind": "OBJECT",
-          "name": "TimeField",
+          "name": "ShippingRateCartValuePriceTier",
           "description": null,
           "fields": [
             {
-              "name": "value",
+              "name": "minimumCentAmount",
               "description": null,
               "args": [],
               "type": {
@@ -24303,7 +26615,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Time",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -24311,40 +26623,35 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "price",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "OBJECT",
+                  "name": "Money",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
+            },
             {
-              "kind": "INTERFACE",
-              "name": "CustomField",
-              "ofType": null
-            }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "TimeType",
-          "description": null,
-          "fields": [
+              "name": "isMatching",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
-              "name": "name",
+              "name": "type",
               "description": null,
               "args": [],
               "type": {
@@ -24364,7 +26671,7 @@
           "interfaces": [
             {
               "kind": "INTERFACE",
-              "name": "FieldType",
+              "name": "ShippingRatePriceTier",
               "ofType": null
             }
           ],
@@ -24373,79 +26680,51 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "TransitionProductState",
+          "name": "ShippingRateDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "state",
+              "name": "price",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "INPUT_OBJECT",
-                  "name": "ReferenceInput",
+                  "name": "MoneyDraft",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "force",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "UnpublishProduct",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "dummy",
+              "name": "freeAbove",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "MoneyDraft",
                 "ofType": null
               },
               "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "UpdateCartItemShippingAddress",
-          "description": null,
-          "fields": null,
-          "inputFields": [
+            },
             {
-              "name": "address",
+              "name": "tiers",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "AddressInput",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ShippingRatePriceTierDraft",
+                    "ofType": null
+                  }
                 }
               },
-              "defaultValue": null
+              "defaultValue": "[]"
             }
           ],
           "interfaces": null,
@@ -24454,106 +26733,159 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "UpdateShippingMethodAction",
+          "name": "ShippingRateInputDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "changeName",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ChangeShippingMethodName",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "setDescription",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "SetShippingMethodDescription",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "changeTaxCategory",
+              "name": "Classification",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeShippingMethodTaxCategory",
+                "name": "ClassificationShippingRateInputDraft",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "changeIsDefault",
+              "name": "Score",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "ChangeShippingMethodIsDefault",
+                "name": "ScoreShippingRateInputDraft",
                 "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "ShippingRateInputLocalizedEnumValue",
+          "description": null,
+          "fields": [
             {
-              "name": "addShippingRate",
+              "name": "key",
               "description": null,
+              "args": [],
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "AddShippingMethodShippingRate",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "removeShippingRate",
+              "name": "label",
               "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "RemoveShippingMethodShippingRate",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "addZone",
+              "name": "labelAllLocales",
               "description": null,
+              "args": [],
               "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "AddShippingMethodZone",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
+                      "ofType": null
+                    }
+                  }
+                }
               },
-              "defaultValue": null
-            },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ShippingRateInputTypeInput",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "removeZone",
+              "name": "CartValue",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "RemoveShippingMethodZone",
+                "name": "CartValueInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setKey",
+              "name": "CartClassification",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetShippingMethodKey",
+                "name": "CartClassificationInput",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "setPredicate",
+              "name": "CartScore",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetShippingMethodPredicate",
+                "name": "CartScoreInput",
                 "ofType": null
               },
               "defaultValue": null
@@ -24565,17 +26897,35 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "WhitespaceSuggestTokenizerInput",
+          "name": "ShippingRatePriceTierCartClassificationDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "dummy",
+              "name": "value",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "price",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "MoneyDraft",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             }
@@ -24586,30 +26936,40 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ZoneLocation",
+          "name": "ShippingRatePriceTierCartScoreDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "country",
+              "name": "score",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Country",
+                  "name": "Int",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "state",
+              "name": "price",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "MoneyDraft",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "priceFunction",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "PriceFunctionDraft",
                 "ofType": null
               },
               "defaultValue": null
@@ -24621,41 +26981,37 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ZoneRateDraft",
+          "name": "ShippingRatePriceTierCartValueDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "zone",
+              "name": "minimumCentAmount",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "ReferenceInput",
+                  "kind": "SCALAR",
+                  "name": "Int",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "shippingRates",
+              "name": "price",
               "description": null,
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "ShippingRateDraft",
-                    "ofType": null
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "MoneyDraft",
+                  "ofType": null
                 }
               },
-              "defaultValue": "[]"
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -24664,46 +27020,36 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "ZoneUpdateAction",
+          "name": "ShippingRatePriceTierDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "changeName",
-              "description": null,
-              "type": {
-                "kind": "INPUT_OBJECT",
-                "name": "ChangeZoneName",
-                "ofType": null
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "setDescription",
+              "name": "CartValue",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "SetZoneDescription",
+                "name": "ShippingRatePriceTierCartValueDraft",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "addLocation",
+              "name": "CartClassification",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "AddLocation",
+                "name": "ShippingRatePriceTierCartClassificationDraft",
                 "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "removeLocation",
+              "name": "CartScore",
               "description": null,
               "type": {
                 "kind": "INPUT_OBJECT",
-                "name": "RemoveLocation",
+                "name": "ShippingRatePriceTierCartScoreDraft",
                 "ofType": null
               },
               "defaultValue": null
@@ -24714,38 +27060,46 @@
           "possibleTypes": null
         },
         {
-          "kind": "INPUT_OBJECT",
-          "name": "addAttributeDefinition",
+          "kind": "OBJECT",
+          "name": "ShippingTarget",
           "description": null,
-          "fields": null,
-          "inputFields": [
+          "fields": [
             {
-              "name": "attributeDefinition",
+              "name": "type",
               "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "AttributeDefinitionDraft",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "CartDiscountTarget",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
           "kind": "INPUT_OBJECT",
-          "name": "addLocalizedEnumValue",
+          "name": "ShippingTargetDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "addressKey",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -24759,14 +27113,14 @@
               "defaultValue": null
             },
             {
-              "name": "value",
+              "name": "quantity",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "LocalizedEnumValueDraft",
+                  "kind": "SCALAR",
+                  "name": "Long",
                   "ofType": null
                 }
               },
@@ -24779,12 +27133,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "addPlainEnumValue",
+          "name": "ShippingTargetDraftType",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "addressKey",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -24798,14 +27152,14 @@
               "defaultValue": null
             },
             {
-              "name": "value",
+              "name": "quantity",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "PlainEnumValueDraft",
+                  "kind": "SCALAR",
+                  "name": "Long",
                   "ofType": null
                 }
               },
@@ -24818,35 +27172,38 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changeAttributeName",
+          "name": "ShippingTargetInput",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "dummy",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "SimpleAttributeTypeDraft",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "newAttributeName",
+              "name": "dummy",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -24857,29 +27214,17 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changeAttributeOrder",
+          "name": "StoreUpdateAction",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeDefinitions",
+              "name": "setName",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "AttributeDefinitionDraft",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "SetStoreName",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -24889,14 +27234,14 @@
           "possibleTypes": null
         },
         {
-          "kind": "INPUT_OBJECT",
-          "name": "changeDescription",
+          "kind": "OBJECT",
+          "name": "StringAttribute",
           "description": null,
-          "fields": null,
-          "inputFields": [
+          "fields": [
             {
-              "name": "description",
+              "name": "value",
               "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -24906,22 +27251,46 @@
                   "ofType": null
                 }
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Attribute",
+              "ofType": null
             }
           ],
-          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "INPUT_OBJECT",
-          "name": "changeEnumKey",
+          "kind": "OBJECT",
+          "name": "StringField",
           "description": null,
-          "fields": null,
-          "inputFields": [
+          "fields": [
             {
-              "name": "attributeName",
+              "name": "value",
               "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -24931,11 +27300,13 @@
                   "ofType": null
                 }
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "key",
+              "name": "name",
               "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -24945,11 +27316,30 @@
                   "ofType": null
                 }
               },
-              "defaultValue": null
-            },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "newKey",
+              "kind": "INTERFACE",
+              "name": "CustomField",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "StringType",
+          "description": null,
+          "fields": [
+            {
+              "name": "name",
               "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -24959,21 +27349,29 @@
                   "ofType": null
                 }
               },
-              "defaultValue": null
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "FieldType",
+              "ofType": null
             }
           ],
-          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changeInputHint",
+          "name": "SubRateDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "name",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -24987,14 +27385,14 @@
               "defaultValue": null
             },
             {
-              "name": "newValue",
+              "name": "amount",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "TextInputHint",
+                  "kind": "SCALAR",
+                  "name": "Float",
                   "ofType": null
                 }
               },
@@ -25007,33 +27405,44 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changeIsSearchable",
+          "name": "TaxCategoryAddTaxRate",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "taxRate",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "INPUT_OBJECT",
+                  "name": "TaxRateDraft",
                   "ofType": null
                 }
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "TaxCategoryChangeName",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "isSearchable",
+              "name": "name",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -25046,12 +27455,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changeLabel",
+          "name": "TaxCategoryDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "name",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -25065,26 +27474,42 @@
               "defaultValue": null
             },
             {
-              "name": "label",
+              "name": "description",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "rates",
+              "description": null,
+              "type": {
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
+                  "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "LocalizedStringItemInputType",
-                      "ofType": null
-                    }
+                    "kind": "INPUT_OBJECT",
+                    "name": "TaxRateDraft",
+                    "ofType": null
                   }
                 }
               },
               "defaultValue": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -25093,12 +27518,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changeLocalizedEnumValueLabel",
+          "name": "TaxCategoryRemoveTaxRate",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "taxRateId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -25110,20 +27535,6 @@
                 }
               },
               "defaultValue": null
-            },
-            {
-              "name": "newValue",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "LocalizedEnumValueDraft",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
             }
           ],
           "interfaces": null,
@@ -25132,12 +27543,12 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changeLocalizedEnumValueOrder",
+          "name": "TaxCategoryReplaceTaxRate",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "taxRateId",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
@@ -25151,23 +27562,15 @@
               "defaultValue": null
             },
             {
-              "name": "values",
+              "name": "taxRate",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "LocalizedEnumValueDraft",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "TaxRateDraft",
+                  "ofType": null
                 }
               },
               "defaultValue": null
@@ -25179,21 +27582,17 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changeName",
+          "name": "TaxCategorySetDescription",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "name",
+              "name": "description",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -25204,35 +27603,67 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changePlainEnumValueLabel",
+          "name": "TaxCategoryUpdateAction",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "changeName",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "TaxCategoryChangeName",
+                "ofType": null
               },
               "defaultValue": null
             },
             {
-              "name": "newValue",
+              "name": "setDescription",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INPUT_OBJECT",
-                  "name": "PlainEnumValueDraft",
-                  "ofType": null
-                }
+                "kind": "INPUT_OBJECT",
+                "name": "TaxCategorySetDescription",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "addTaxRate",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "TaxCategoryAddTaxRate",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "replaceTaxRate",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "TaxCategoryReplaceTaxRate",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "removeTaxRate",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "TaxCategoryRemoveTaxRate",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "setKey",
+              "description": null,
+              "type": {
+                "kind": "INPUT_OBJECT",
+                "name": "SetTaxCategoryKey",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -25243,42 +27674,44 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "changePlainEnumValueOrder",
+          "name": "TaxPortionDraft",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "name",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "rate",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Float",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "values",
+              "name": "amount",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "PlainEnumValueDraft",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "MoneyInput",
+                  "ofType": null
                 }
               },
               "defaultValue": null
@@ -25289,85 +27722,103 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "iOSUserType",
+          "kind": "INPUT_OBJECT",
+          "name": "TaxRateDraft",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "typeRef",
+              "name": "name",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Reference",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "type",
+              "name": "amount",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Float",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "includedInPrice",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "TypeDefinition",
+                  "kind": "SCALAR",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "apnsToken",
+              "name": "country",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "StringField",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Country",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "myStore",
+              "name": "state",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "ReferenceField",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
+              "defaultValue": null
+            },
             {
-              "kind": "INTERFACE",
-              "name": "Type",
-              "ofType": null
+              "name": "subRates",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "SubRateDraft",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": "[]"
             }
           ],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "mainProductType",
-          "description": "Sunrise Product Data Set Structure",
+          "name": "TextAttributeDefinitionType",
+          "description": null,
           "fields": [
             {
-              "name": "productTypeId",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
@@ -25381,314 +27832,437 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "creationDate",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "DateTimeAttribute",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "kind": "INTERFACE",
+              "name": "AttributeDefinitionType",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "Time",
+          "description": "Time is a scalar value that represents an ISO8601 formatted time.",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "TimeAttribute",
+          "description": null,
+          "fields": [
             {
-              "name": "articleNumberManufacturer",
+              "name": "value",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "StringAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Time",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "articleNumberMax",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "StringAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "matrixId",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "StringAttribute",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "kind": "INTERFACE",
+              "name": "Attribute",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "TimeAttributeDefinitionType",
+          "description": null,
+          "fields": [
             {
-              "name": "baseId",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "StringAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "designer",
+              "kind": "INTERFACE",
+              "name": "AttributeDefinitionType",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "TimeField",
+          "description": null,
+          "fields": [
+            {
+              "name": "value",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "EnumAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Time",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "madeInItaly",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "EnumAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "completeTheLook",
+              "kind": "INTERFACE",
+              "name": "CustomField",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "TimeType",
+          "description": null,
+          "fields": [
+            {
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "StringAttribute",
-                    "ofType": null
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "commonSize",
+              "kind": "INTERFACE",
+              "name": "FieldType",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "TrackingDataDraftType",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "trackingId",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "EnumAttribute",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "size",
+              "name": "carrier",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "StringAttribute",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "color",
+              "name": "provider",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "LocalizedEnumAttribute",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "colorFreeDefinition",
+              "name": "providerTransaction",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "LocalizedStringAttribute",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "details",
+              "name": "isReturn",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "LIST",
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "false"
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "TransitionOrderCustomLineItemState",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "customLineItemId",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "LocalizedStringAttribute",
-                    "ofType": null
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "style",
+              "name": "quantity",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "EnumAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "gender",
+              "name": "fromState",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "EnumAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "season",
+              "name": "toState",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "StringAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "isOnStock",
+              "name": "actualTransitionDate",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "BooleanAttribute",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "TransitionOrderLineItemState",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "lineItemId",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
             },
             {
-              "name": "isLook",
+              "name": "quantity",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "BooleanAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "lookProducts",
+              "name": "fromState",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "StringAttribute",
-                    "ofType": null
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "seasonNew",
+              "name": "toState",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "StringAttribute",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "sapExternalId",
+              "name": "actualTransitionDate",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "StringAttribute",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "ProductType",
-              "ofType": null
+              "defaultValue": null
             }
           ],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "removeAttributeDefinition",
+          "name": "TransitionOrderState",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "name",
+              "name": "state",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
                   "ofType": null
                 }
               },
               "defaultValue": null
+            },
+            {
+              "name": "force",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "defaultValue": "false"
             }
           ],
           "interfaces": null,
@@ -25697,43 +28271,31 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "removeEnumValues",
+          "name": "TransitionProductState",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "state",
               "description": null,
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "INPUT_OBJECT",
+                  "name": "ReferenceInput",
                   "ofType": null
                 }
               },
               "defaultValue": null
             },
             {
-              "name": "keys",
+              "name": "force",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
               },
               "defaultValue": null
             }
@@ -25744,38 +28306,41 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "setInputTip",
+          "name": "UnpublishProduct",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "attributeName",
+              "name": "dummy",
               "description": null,
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "defaultValue": null
-            },
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "UpdateCartItemShippingAddress",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "inputTip",
+              "name": "address",
               "description": null,
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedStringItemInputType",
-                    "ofType": null
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "AddressInput",
+                  "ofType": null
                 }
               },
               "defaultValue": null
@@ -25787,17 +28352,21 @@
         },
         {
           "kind": "INPUT_OBJECT",
-          "name": "setKey",
+          "name": "UpdateOrderItemShippingAddress",
           "description": null,
           "fields": null,
           "inputFields": [
             {
-              "name": "key",
+              "name": "address",
               "description": null,
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "AddressInput",
+                  "ofType": null
+                }
               },
               "defaultValue": null
             }
@@ -25807,356 +28376,322 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "Address",
-          "description": "An address represents a postal address.",
-          "fields": [
-            {
-              "name": "id",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "title",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "salutation",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "firstName",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "lastName",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+          "kind": "INPUT_OBJECT",
+          "name": "UpdateOrderSyncInfo",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "streetName",
+              "name": "channel",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "streetNumber",
+              "name": "syncedAt",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "DateTime",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "additionalStreetInfo",
+              "name": "externalId",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "WhitespaceSuggestTokenizerInput",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "postalCode",
+              "name": "dummy",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ZoneLocation",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "city",
+              "name": "country",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Country",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "region",
+              "name": "state",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ZoneRateDraft",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "state",
+              "name": "zone",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ResourceIdentifierInput",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "country",
+              "name": "shippingRates",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Country",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ShippingRateDraft",
+                    "ofType": null
+                  }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": "[]"
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "ZoneUpdateAction",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "company",
+              "name": "addLocation",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "AddZoneLocation",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "department",
+              "name": "changeName",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "ChangeZoneName",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "building",
+              "name": "removeLocation",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "RemoveZoneLocation",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "apartment",
+              "name": "setDescription",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "SetZoneDescription",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "pOBox",
+              "name": "setKey",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "INPUT_OBJECT",
+                "name": "SetZoneKey",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "addAttributeDefinition",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "contactInfo",
+              "name": "attributeDefinition",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "AddressContactInfo",
+                  "kind": "INPUT_OBJECT",
+                  "name": "AttributeDefinitionDraft",
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "additionalAddressInfo",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "externalId",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "key",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "AddressContactInfo",
+          "kind": "INPUT_OBJECT",
+          "name": "addLocalizedEnumValue",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "phone",
+              "name": "attributeName",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "mobile",
+              "name": "value",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "LocalizedEnumValueDraft",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "addPlainEnumValue",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "email",
+              "name": "attributeName",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "fax",
+              "name": "value",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "PlainEnumValueDraft",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "Asset",
+          "kind": "INPUT_OBJECT",
+          "name": "changeAttributeName",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "id",
+              "name": "attributeName",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -26166,25 +28701,36 @@
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "key",
+              "name": "newAttributeName",
               "description": null,
-              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeAttributeOrder",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "sources",
+              "name": "attributeDefinitions",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -26195,61 +28741,29 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "AssetSource",
+                      "kind": "INPUT_OBJECT",
+                      "name": "AttributeDefinitionDraft",
                       "ofType": null
                     }
                   }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "name",
-              "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeAttributeOrderByName",
+          "description": null,
+          "fields": null,
+          "inputFields": [
             {
-              "name": "nameAllLocales",
+              "name": "attributeNames",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
@@ -26260,8 +28774,4073 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "LocalizedString",
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeDescription",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "description",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeEnumKey",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "newKey",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeInputHint",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "newValue",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "TextInputHint",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeIsSearchable",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "isSearchable",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeLabel",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "label",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "LocalizedStringItemInputType",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeLocalizedEnumValueLabel",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "newValue",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "LocalizedEnumValueDraft",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeLocalizedEnumValueOrder",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "values",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "LocalizedEnumValueDraft",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changeName",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "name",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changePlainEnumValueLabel",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "newValue",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "PlainEnumValueDraft",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "changePlainEnumValueOrder",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "values",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "PlainEnumValueDraft",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "iOSUserType",
+          "description": null,
+          "fields": [
+            {
+              "name": "typeRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Reference",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "type",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "TypeDefinition",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "apnsToken",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringField",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "myStore",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ReferenceField",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Type",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "mainProductType",
+          "description": "Sunrise Product Data Set Structure",
+          "fields": [
+            {
+              "name": "productTypeId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "creationDate",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DateTimeAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "articleNumberManufacturer",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "articleNumberMax",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "matrixId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "baseId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "designer",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "EnumAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "madeInItaly",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "EnumAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "completeTheLook",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "StringAttribute",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "commonSize",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "EnumAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "size",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "color",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "LocalizedEnumAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "colorFreeDefinition",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "LocalizedStringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "details",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedStringAttribute",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "style",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "EnumAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "gender",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "EnumAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "season",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "isOnStock",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "BooleanAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "isLook",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "BooleanAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lookProducts",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "StringAttribute",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "seasonNew",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "sapExternalId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "StringAttribute",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "ProductType",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "removeAttributeDefinition",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "name",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "removeEnumValues",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "keys",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "setInputTip",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "attributeName",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "inputTip",
+              "description": null,
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedStringItemInputType",
+                    "ofType": null
+                  }
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "setKey",
+          "description": null,
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "key",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "APIClientWithoutSecret",
+          "description": "API Clients can be used to obtain OAuth 2 access tokens",
+          "fields": [
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "scope",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastUsedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Date",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "APIClientWithoutSecretQueryResult",
+          "description": null,
+          "fields": [
+            {
+              "name": "offset",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "count",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "total",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "APIClientWithoutSecret",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Address",
+          "description": "An address represents a postal address.",
+          "fields": [
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "title",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "salutation",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "firstName",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastName",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "streetName",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "streetNumber",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "additionalStreetInfo",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "postalCode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "city",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "region",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "state",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "country",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Country",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "company",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "department",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "building",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "apartment",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pOBox",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "contactInfo",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "AddressContactInfo",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "additionalAddressInfo",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "externalId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "AddressContactInfo",
+          "description": null,
+          "fields": [
+            {
+              "name": "phone",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "mobile",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "email",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fax",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Asset",
+          "description": null,
+          "fields": [
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "sources",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "AssetSource",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "nameAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "description",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "descriptionAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedString",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "tags",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "RawCustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFields",
+              "description": "This field would contain type data",
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldList",
+              "description": "Custom fields are returned as a list instead of an object structure.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "AssetDimensions",
+          "description": null,
+          "fields": [
+            {
+              "name": "width",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "height",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "AssetSource",
+          "description": null,
+          "fields": [
+            {
+              "name": "uri",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "dimensions",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "AssetDimensions",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "contentType",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "Attribute",
+          "description": null,
+          "fields": [
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "BooleanAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "DateAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "DateTimeAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "EnumAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "LocalizedEnumAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "LocalizedStringAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "MoneyAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "NumberAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "ReferenceAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "StringAttribute",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "TimeAttribute",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "ENUM",
+          "name": "AttributeConstraint",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "None",
+              "description": "No constraints are applied to the attribute",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Unique",
+              "description": "Attribute value should be different in each variant",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "CombinationUnique",
+              "description": "A set of attributes, that have this constraint, should have different combinations in each variant",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "SameForAll",
+              "description": "Attribute value should be the same in all variants",
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "AttributeDefinition",
+          "description": null,
+          "fields": [
+            {
+              "name": "type",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "AttributeDefinitionType",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "label",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "isRequired",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "attributeConstraint",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "AttributeConstraint",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "inputTip",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "inputHint",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "TextInputHint",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "isSearchable",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "labelAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "inputTipAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedString",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "AttributeDefinitionResult",
+          "description": null,
+          "fields": [
+            {
+              "name": "limit",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "offset",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "total",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "AttributeDefinition",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "AttributeDefinitionType",
+          "description": "(https://dev.commercetools.com/http-api-projects-productTypes.html#attributetype)[https://dev.commercetools.com/http-api-projects-productTypes.html#attributetype]",
+          "fields": [
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "BooleanAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "DateAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "DateTimeAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "EnumAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "LocalizableEnumAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "LocalizableTextAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "MoneyAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "NestedAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "NumberAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "ReferenceAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "SetAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "TextAttributeDefinitionType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "TimeAttributeDefinitionType",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "BaseMoney",
+          "description": null,
+          "fields": [
+            {
+              "name": "type",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "currencyCode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Currency",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "centAmount",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "fractionDigits",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "HighPrecisionMoney",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Money",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Cart",
+          "description": "A shopping cart holds product variants and can be ordered. Each cart either belongs to a registered customer or is an anonymous cart.",
+          "fields": [
+            {
+              "name": "customerId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customer",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Customer",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customerEmail",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "anonymousId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lineItems",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LineItem",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customLineItems",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CustomLineItem",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "totalPrice",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Money",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "taxedPrice",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "TaxedPrice",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shippingAddress",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Address",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "billingAddress",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Address",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "inventoryMode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "InventoryMode",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "taxMode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "TaxMode",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "taxRoundingMode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "RoundingMode",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "taxCalculationMode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "TaxCalculationMode",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customerGroup",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CustomerGroup",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customerGroupRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Reference",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "country",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Country",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shippingInfo",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ShippingInfo",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "discountCodes",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "DiscountCodeInfo",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "refusedGifts",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CartDiscount",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "refusedGiftsRefs",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Reference",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "paymentInfo",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "PaymentInfo",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "locale",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Locale",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shippingRateInput",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "ShippingRateInput",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "origin",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "CartOrigin",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "storeRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "KeyReference",
+                "ofType": null
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
+            },
+            {
+              "name": "store",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Store",
+                "ofType": null
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
+            },
+            {
+              "name": "itemShippingAddresses",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Address",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "cartState",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "CartState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "RawCustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFields",
+              "description": "This field would contain type data",
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deleteDaysAfterLastModification",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "version",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldList",
+              "description": "Custom fields are returned as a list instead of an object structure.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "CartDiscount",
+          "description": "\nCart discounts are recalculated every time LineItems or CustomLineItems are added or removed from the Cart or an order is created from the cart.\n\nThe number of active cart discounts that do not require a discount code (isActive=true and requiresDiscountCode=false) is limited to 100.\n      ",
+          "fields": [
+            {
+              "name": "cartPredicate",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "validFrom",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "validUntil",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "stackingMode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "StackingMode",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "isActive",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "requiresDiscountCode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "sortOrder",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "description",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "nameAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "descriptionAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedString",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "RawCustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFields",
+              "description": "This field would contain type data",
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "value",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "CartDiscountValue",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "target",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "CartDiscountTarget",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "version",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldList",
+              "description": "Custom fields are returned as a list instead of an object structure.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "CartDiscountQueryResult",
+          "description": null,
+          "fields": [
+            {
+              "name": "offset",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "count",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "total",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CartDiscount",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "CartDiscountTarget",
+          "description": null,
+          "fields": [
+            {
+              "name": "type",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "CustomLineItemsTarget",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "LineItemsTarget",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "MultiBuyCustomLineItemsTarget",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "MultiBuyLineItemsTarget",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "ShippingTarget",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "CartDiscountValue",
+          "description": null,
+          "fields": [
+            {
+              "name": "type",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "AbsoluteDiscountValue",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "GiftLineItemValue",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "RelativeDiscountValue",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "ENUM",
+          "name": "CartOrigin",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "Merchant",
+              "description": "The cart was created by the merchant on behalf of the customer",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Customer",
+              "description": "The cart was created by the customer. This is the default value",
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "CartQueryInterface",
+          "description": "Fields to access carts. Includes direct access to a single cart and searching for carts.",
+          "fields": [
+            {
+              "name": "cart",
+              "description": null,
+              "args": [
+                {
+                  "name": "id",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Cart",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "carts",
+              "description": null,
+              "args": [
+                {
+                  "name": "where",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sort",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "CartQueryResult",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "InStore",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Query",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "OBJECT",
+          "name": "CartQueryResult",
+          "description": null,
+          "fields": [
+            {
+              "name": "offset",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "count",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "total",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Cart",
                       "ofType": null
                     }
                   }
@@ -26269,14 +32848,98 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "CartState",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "Ordered",
+              "description": "The cart was ordered. No further operations on the cart are allowed.",
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "description",
+              "name": "Merged",
+              "description": "Anonymous cart whose content was merged into a customers cart on signin. No further operations on the cart are allowed.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Active",
+              "description": "The cart can be updated and ordered. It is the default state.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Category",
+          "description": null,
+          "fields": [
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "version",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
               "description": null,
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -26312,27 +32975,7 @@
               "deprecationReason": null
             },
             {
-              "name": "descriptionAllLocales",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "LocalizedString",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "tags",
+              "name": "nameAllLocales",
               "description": null,
               "args": [],
               "type": {
@@ -26345,8 +32988,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
                       "ofType": null
                     }
                   }
@@ -26356,30 +32999,22 @@
               "deprecationReason": null
             },
             {
-              "name": "customFieldsRaw",
-              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "name": "description",
+              "description": null,
               "args": [
                 {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -26388,7 +33023,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "String",
+                        "name": "Locale",
                         "ofType": null
                       }
                     }
@@ -26396,6 +33031,18 @@
                   "defaultValue": null
                 }
               ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "descriptionAllLocales",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "LIST",
                 "name": null,
@@ -26404,7 +33051,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "OBJECT",
-                    "name": "RawCustomField",
+                    "name": "LocalizedString",
                     "ofType": null
                   }
                 }
@@ -26413,42 +33060,22 @@
               "deprecationReason": null
             },
             {
-              "name": "customFields",
-              "description": "Custom fields",
-              "args": [],
-              "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "customFieldList",
-              "description": "Custom fields are returned as a list instead of an object structure.",
+              "name": "slug",
+              "description": null,
               "args": [
                 {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -26457,7 +33084,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "String",
+                        "name": "Locale",
                         "ofType": null
                       }
                     }
@@ -26466,274 +33093,111 @@
                 }
               ],
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INTERFACE",
-                    "name": "CustomField",
-                    "ofType": null
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "AssetDimensions",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "width",
+              "name": "slugAllLocales",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "height",
+              "name": "ancestorsRef",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Reference",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "AssetSource",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "uri",
+              "name": "ancestors",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Category",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "key",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "dimensions",
+              "name": "parentRef",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "AssetDimensions",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "contentType",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "name": "Reference",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INTERFACE",
-          "name": "Attribute",
-          "description": null,
-          "fields": [
-            {
-              "name": "name",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "BooleanAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "DateAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "DateTimeAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "EnumAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "LocalizedEnumAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "LocalizedStringAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "MoneyAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "NumberAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "ReferenceAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "StringAttribute",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "TimeAttribute",
-              "ofType": null
-            }
-          ]
-        },
-        {
-          "kind": "ENUM",
-          "name": "AttributeConstraint",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "None",
-              "description": "No constraints are applied to the attribute",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "Unique",
-              "description": "Attribute value should be different in each variant",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "CombinationUnique",
-              "description": "A set of attributes, that have this constraint, should have different combinations in each variant",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "SameForAll",
-              "description": "Attribute value should be the same in all variants",
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "AttributeDefinition",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "type",
+              "name": "parent",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "AttributeDefinitionType",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Category",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "orderHint",
               "description": null,
               "args": [],
               "type": {
@@ -26749,12 +33213,24 @@
               "deprecationReason": null
             },
             {
-              "name": "label",
+              "name": "externalId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "metaTitle",
               "description": null,
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -26790,44 +33266,53 @@
               "deprecationReason": null
             },
             {
-              "name": "isRequired",
+              "name": "metaKeywords",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
                 }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "attributeConstraint",
-              "description": null,
-              "args": [],
+              ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "AttributeConstraint",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "inputTip",
+              "name": "metaDescription",
               "description": null,
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -26863,15 +33348,83 @@
               "deprecationReason": null
             },
             {
-              "name": "inputHint",
+              "name": "productCount",
+              "description": "Number of a products in the category subtree.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": true,
+              "deprecationReason": "The returned number is representing only staged products. Use 'stagedProductCount' instead"
+            },
+            {
+              "name": "stagedProductCount",
+              "description": "Number of staged products in the category subtree.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "childCount",
+              "description": "Number of direct child categories.",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "children",
+              "description": "Direct child categories.",
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Category",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "TextInputHint",
+                  "kind": "SCALAR",
+                  "name": "DateTime",
                   "ofType": null
                 }
               },
@@ -26879,7 +33432,7 @@
               "deprecationReason": null
             },
             {
-              "name": "isSearchable",
+              "name": "lastModifiedAt",
               "description": null,
               "args": [],
               "type": {
@@ -26887,7 +33440,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
+                  "name": "DateTime",
                   "ofType": null
                 }
               },
@@ -26895,7 +33448,7 @@
               "deprecationReason": null
             },
             {
-              "name": "labelAllLocales",
+              "name": "assets",
               "description": null,
               "args": [],
               "type": {
@@ -26909,7 +33462,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "LocalizedString",
+                      "name": "Asset",
                       "ofType": null
                     }
                   }
@@ -26919,9 +33472,46 @@
               "deprecationReason": null
             },
             {
-              "name": "inputTipAllLocales",
-              "description": null,
-              "args": [],
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "LIST",
                 "name": null,
@@ -26930,83 +33520,101 @@
                   "name": null,
                   "ofType": {
                     "kind": "OBJECT",
-                    "name": "LocalizedString",
+                    "name": "RawCustomField",
                     "ofType": null
                   }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "AttributeDefinitionResult",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "limit",
-              "description": null,
+              "name": "customFields",
+              "description": "This field would contain type data",
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "INTERFACE",
+                "name": "Type",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "offset",
+              "name": "createdBy",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "OBJECT",
+                "name": "Initiator",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "total",
+              "name": "lastModifiedBy",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "results",
-              "description": null,
-              "args": [],
+              "name": "customFieldList",
+              "description": "Custom fields are returned as a list instead of an object structure.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
+                  "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "AttributeDefinition",
-                      "ofType": null
-                    }
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
+                    "ofType": null
                   }
                 }
               },
@@ -27015,17 +33623,39 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [],
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
+            }
+          ],
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "INTERFACE",
-          "name": "AttributeDefinitionType",
-          "description": "(https://dev.commercetools.com/http-api-projects-productTypes.html#attributetype)[https://dev.commercetools.com/http-api-projects-productTypes.html#attributetype]",
+          "kind": "OBJECT",
+          "name": "CategoryOrderHint",
+          "description": null,
           "fields": [
             {
-              "name": "name",
+              "name": "categoryId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "orderHint",
               "description": null,
               "args": [],
               "type": {
@@ -27042,83 +33672,17 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "BooleanAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "DateAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "DateTimeAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "EnumAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "LocalizableEnumAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "LocalizableTextAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "MoneyAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "NestedAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "NumberAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "ReferenceAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "SetAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "TextAttributeDefinitionType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "TimeAttributeDefinitionType",
-              "ofType": null
-            }
-          ]
+          "possibleTypes": null
         },
         {
-          "kind": "INTERFACE",
-          "name": "BaseMoney",
+          "kind": "OBJECT",
+          "name": "CategoryQueryResult",
           "description": null,
           "fields": [
             {
-              "name": "type",
+              "name": "offset",
               "description": null,
               "args": [],
               "type": {
@@ -27126,7 +33690,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -27134,7 +33698,7 @@
               "deprecationReason": null
             },
             {
-              "name": "currencyCode",
+              "name": "count",
               "description": null,
               "args": [],
               "type": {
@@ -27142,7 +33706,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Currency",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -27150,7 +33714,7 @@
               "deprecationReason": null
             },
             {
-              "name": "centAmount",
+              "name": "total",
               "description": null,
               "args": [],
               "type": {
@@ -27166,16 +33730,24 @@
               "deprecationReason": null
             },
             {
-              "name": "fractionDigits",
+              "name": "results",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Category",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
@@ -27183,25 +33755,14 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "HighPrecisionMoney",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "Money",
-              "ofType": null
-            }
-          ]
+          "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "Cart",
-          "description": "A shopping cart holds product variants and can be ordered. Each cart either belongs to a registered customer or is an anonymous cart.",
+          "name": "CategorySearch",
+          "description": null,
           "fields": [
             {
               "name": "id",
@@ -27219,6 +33780,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "version",
               "description": null,
@@ -27236,9 +33809,38 @@
               "deprecationReason": null
             },
             {
-              "name": "customerId",
+              "name": "name",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -27248,21 +33850,62 @@
               "deprecationReason": null
             },
             {
-              "name": "customer",
+              "name": "nameAllLocales",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Customer",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customerEmail",
+              "name": "description",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -27272,9 +33915,58 @@
               "deprecationReason": null
             },
             {
-              "name": "anonymousId",
+              "name": "descriptionAllLocales",
               "description": null,
               "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedString",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "slug",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -27284,7 +33976,7 @@
               "deprecationReason": null
             },
             {
-              "name": "lineItems",
+              "name": "slugAllLocales",
               "description": null,
               "args": [],
               "type": {
@@ -27298,7 +33990,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "LineItem",
+                      "name": "LocalizedString",
                       "ofType": null
                     }
                   }
@@ -27308,7 +34000,7 @@
               "deprecationReason": null
             },
             {
-              "name": "customLineItems",
+              "name": "ancestorsRef",
               "description": null,
               "args": [],
               "type": {
@@ -27322,7 +34014,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "CustomLineItem",
+                      "name": "Reference",
                       "ofType": null
                     }
                   }
@@ -27332,99 +34024,91 @@
               "deprecationReason": null
             },
             {
-              "name": "totalPrice",
+              "name": "ancestors",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Money",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CategorySearch",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "taxedPrice",
+              "name": "parentRef",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "TaxedPrice",
+                "name": "Reference",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "cartState",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "CartState",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "shippingAddress",
+              "name": "parent",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Address",
+                "name": "CategorySearch",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "billingAddress",
+              "name": "externalId",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Address",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "inventoryMode",
+              "name": "productCount",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "InventoryMode",
+                  "kind": "SCALAR",
+                  "name": "Int",
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "The returned number is representing only staged products. Use 'stagedProductCount' instead"
             },
             {
-              "name": "taxMode",
+              "name": "stagedProductCount",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "TaxMode",
+                  "kind": "SCALAR",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -27432,15 +34116,15 @@
               "deprecationReason": null
             },
             {
-              "name": "taxRoundingMode",
+              "name": "childCount",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "RoundingMode",
+                  "kind": "SCALAR",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -27448,119 +34132,103 @@
               "deprecationReason": null
             },
             {
-              "name": "taxCalculationMode",
+              "name": "productTypeNames",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "TaxCalculationMode",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customerGroup",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "CustomerGroup",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "customerGroupRef",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Reference",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "country",
-              "description": null,
+              "name": "children",
+              "description": "Direct child categories.",
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Country",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CategorySearch",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "shippingInfo",
+              "name": "createdAt",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "ShippingInfo",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discountCodes",
+              "name": "lastModifiedAt",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "DiscountCodeInfo",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "refusedGifts",
+              "name": "orderHint",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "CartDiscount",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "refusedGiftsRefs",
+              "name": "assets",
               "description": null,
               "args": [],
               "type": {
@@ -27574,7 +34242,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "Reference",
+                      "name": "Asset",
                       "ofType": null
                     }
                   }
@@ -27640,129 +34308,9 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "paymentInfo",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "PaymentInfo",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "locale",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Locale",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "deleteDaysAfterLastModification",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "shippingRateInput",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "INTERFACE",
-                "name": "ShippingRateInput",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "origin",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "CartOrigin",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "createdAt",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "lastModifiedAt",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "itemShippingAddresses",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Address",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "customFields",
-              "description": "Custom fields",
+              "description": "This field would contain type data",
               "args": [],
               "type": {
                 "kind": "INTERFACE",
@@ -27837,11 +34385,11 @@
         },
         {
           "kind": "OBJECT",
-          "name": "CartDiscount",
-          "description": "\nCart discounts are recalculated every time LineItems or CustomLineItems are added or removed from the Cart or an order is created from the cart.\n\nThe number of active cart discounts that do not require a discount code (isActive=true and requiresDiscountCode=false) is limited to 100.\n      ",
+          "name": "CategorySearchResult",
+          "description": null,
           "fields": [
             {
-              "name": "cartPredicate",
+              "name": "offset",
               "description": null,
               "args": [],
               "type": {
@@ -27849,7 +34397,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -27857,47 +34405,74 @@
               "deprecationReason": null
             },
             {
-              "name": "validFrom",
+              "name": "count",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "validUntil",
+              "name": "total",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "stackingMode",
+              "name": "results",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "StackingMode",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CategorySearch",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Channel",
+          "description": null,
+          "fields": [
             {
-              "name": "isActive",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -27905,7 +34480,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -27913,7 +34488,7 @@
               "deprecationReason": null
             },
             {
-              "name": "requiresDiscountCode",
+              "name": "version",
               "description": null,
               "args": [],
               "type": {
@@ -27921,7 +34496,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
+                  "name": "Long",
                   "ofType": null
                 }
               },
@@ -27929,7 +34504,7 @@
               "deprecationReason": null
             },
             {
-              "name": "sortOrder",
+              "name": "key",
               "description": null,
               "args": [],
               "type": {
@@ -27945,53 +34520,36 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "roles",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "ENUM",
+                      "name": "ChannelRole",
+                      "ofType": null
                     }
-                  },
-                  "defaultValue": null
+                  }
                 }
-              ],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "description",
+              "name": "name",
               "description": null,
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -28030,30 +34588,6 @@
               "name": "nameAllLocales",
               "description": null,
               "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "LocalizedString",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "descriptionAllLocales",
-              "description": null,
-              "args": [],
               "type": {
                 "kind": "LIST",
                 "name": null,
@@ -28071,30 +34605,22 @@
               "deprecationReason": null
             },
             {
-              "name": "customFieldsRaw",
-              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "name": "description",
+              "description": null,
               "args": [
                 {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -28103,7 +34629,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "String",
+                        "name": "Locale",
                         "ofType": null
                       }
                     }
@@ -28112,77 +34638,41 @@
                 }
               ],
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "RawCustomField",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "value",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "CartDiscountValue",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "target",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "INTERFACE",
-                "name": "CartDiscountTarget",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "id",
+              "name": "descriptionAllLocales",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedString",
+                    "ofType": null
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "version",
+              "name": "address",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Address",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -28220,48 +34710,12 @@
               "deprecationReason": null
             },
             {
-              "name": "createdBy",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Initiator",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "lastModifiedBy",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Initiator",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "customFields",
-              "description": "Custom fields",
-              "args": [],
-              "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "customFieldList",
-              "description": "Custom fields are returned as a list instead of an object structure.",
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
               "args": [
                 {
                   "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -28279,7 +34733,7 @@
                 },
                 {
                   "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -28303,14 +34757,50 @@
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "INTERFACE",
-                    "name": "CustomField",
+                    "kind": "OBJECT",
+                    "name": "RawCustomField",
                     "ofType": null
                   }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "customFields",
+              "description": "This field would contain type data",
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -28326,7 +34816,7 @@
         },
         {
           "kind": "OBJECT",
-          "name": "CartDiscountQueryResult",
+          "name": "ChannelQueryResult",
           "description": null,
           "fields": [
             {
@@ -28392,7 +34882,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "CartDiscount",
+                      "name": "Channel",
                       "ofType": null
                     }
                   }
@@ -28407,13 +34897,74 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "ENUM",
+          "name": "ChannelRole",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "InventorySupply",
+              "description": "Role tells that this channel can be used to track inventory entries.Channels with this role can be treated as warehouses",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "ProductDistribution",
+              "description": "Role tells that this channel can be used to expose products to a specific distribution channel. It can be used by the cart to select a product price.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "OrderExport",
+              "description": "Role tells that this channel can be used to track order export activities.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "OrderImport",
+              "description": "Role tells that this channel can be used to track order import activities.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Primary",
+              "description": "This role can be combined with some other roles (e.g. with `InventorySupply`) to represent the fact that this particular channel is the primary/master channel among the channels of the same type.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "Country",
+          "description": "[ISO 3166-1](http://en.wikipedia.org/wiki/ISO_3166-1) country code.",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "Currency",
+          "description": "Represents a currency. Currencies are identified by their [ISO 4217](http://www.iso.org/iso/home/standards/currency_codes.htm) currency codes.",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INTERFACE",
-          "name": "CartDiscountTarget",
+          "name": "CustomField",
           "description": null,
           "fields": [
             {
-              "name": "type",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
@@ -28435,38 +34986,68 @@
           "possibleTypes": [
             {
               "kind": "OBJECT",
-              "name": "CustomLineItemsTarget",
+              "name": "BooleanField",
               "ofType": null
             },
             {
               "kind": "OBJECT",
-              "name": "LineItemsTarget",
+              "name": "DateField",
               "ofType": null
             },
             {
               "kind": "OBJECT",
-              "name": "MultiBuyCustomLineItemsTarget",
+              "name": "DateTimeField",
               "ofType": null
             },
             {
               "kind": "OBJECT",
-              "name": "MultiBuyLineItemsTarget",
+              "name": "EnumField",
               "ofType": null
             },
             {
               "kind": "OBJECT",
-              "name": "ShippingTarget",
+              "name": "LocalizedEnumField",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "LocalizedStringField",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "MoneyField",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "NumberField",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "ReferenceField",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "StringField",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "TimeField",
               "ofType": null
             }
           ]
         },
         {
-          "kind": "INTERFACE",
-          "name": "CartDiscountValue",
-          "description": null,
+          "kind": "OBJECT",
+          "name": "CustomLineItem",
+          "description": "A custom line item is a generic item that can be added to the cart but is not bound to a product. You can use it for discounts (negative money), vouchers, complex cart rules, additional services or fees. You control the lifecycle of this item.",
           "fields": [
             {
-              "name": "type",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -28480,67 +35061,82 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "AbsoluteDiscountValue",
-              "ofType": null
             },
             {
-              "kind": "OBJECT",
-              "name": "GiftLineItemValue",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "RelativeDiscountValue",
-              "ofType": null
-            }
-          ]
-        },
-        {
-          "kind": "ENUM",
-          "name": "CartOrigin",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "Merchant",
-              "description": "The cart was created by the merchant on behalf of the customer",
+              "name": "name",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "Customer",
-              "description": "The cart was created by the customer. This is the default value",
+              "name": "nameAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "CartQueryResult",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "offset",
+              "name": "money",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "INTERFACE",
+                  "name": "BaseMoney",
                   "ofType": null
                 }
               },
@@ -28548,15 +35144,15 @@
               "deprecationReason": null
             },
             {
-              "name": "count",
+              "name": "totalPrice",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "OBJECT",
+                  "name": "Money",
                   "ofType": null
                 }
               },
@@ -28564,7 +35160,7 @@
               "deprecationReason": null
             },
             {
-              "name": "total",
+              "name": "slug",
               "description": null,
               "args": [],
               "type": {
@@ -28572,7 +35168,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Long",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -28580,156 +35176,83 @@
               "deprecationReason": null
             },
             {
-              "name": "results",
+              "name": "quantity",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Cart",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "CartState",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "Ordered",
-              "description": "The cart was ordered. No further operations on the cart are allowed.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "Merged",
-              "description": "Anonymous cart whose content was merged into a customers cart on signin. No further operations on the cart are allowed.",
-              "isDeprecated": false,
-              "deprecationReason": null
             },
             {
-              "name": "Active",
-              "description": "The cart can be updated and ordered. It is the default state.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Category",
-          "description": null,
-          "fields": [
-            {
-              "name": "id",
+              "name": "state",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "ItemState",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "key",
+              "name": "taxCategory",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "TaxCategory",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "version",
+              "name": "taxCategoryRef",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Reference",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "taxRate",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
+              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "TaxRate",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "nameAllLocales",
+              "name": "discountedPricePerQuantity",
               "description": null,
               "args": [],
               "type": {
@@ -28743,7 +35266,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "LocalizedString",
+                      "name": "DiscountedLineItemPriceForQuantity",
                       "ofType": null
                     }
                   }
@@ -28753,22 +35276,30 @@
               "deprecationReason": null
             },
             {
-              "name": "description",
-              "description": null,
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
               "args": [
                 {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -28777,7 +35308,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "Locale",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -28785,18 +35316,6 @@
                   "defaultValue": null
                 }
               ],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "descriptionAllLocales",
-              "description": null,
-              "args": [],
               "type": {
                 "kind": "LIST",
                 "name": null,
@@ -28805,7 +35324,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "OBJECT",
-                    "name": "LocalizedString",
+                    "name": "RawCustomField",
                     "ofType": null
                   }
                 }
@@ -28814,22 +35333,54 @@
               "deprecationReason": null
             },
             {
-              "name": "slug",
+              "name": "customFields",
+              "description": "This field would contain type data",
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shippingDetails",
               "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ItemShippingDetails",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldList",
+              "description": "Custom fields are returned as a list instead of an object structure.",
               "args": [
                 {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -28838,7 +35389,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "Locale",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -28846,6 +35397,37 @@
                   "defaultValue": null
                 }
               ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Customer",
+          "description": "A customer is a person purchasing products. Carts, Orders and Reviews can be associated to a customer.",
+          "fields": [
+            {
+              "name": "customerNumber",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -28855,7 +35437,39 @@
               "deprecationReason": null
             },
             {
-              "name": "slugAllLocales",
+              "name": "email",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "password",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "addresses",
               "description": null,
               "args": [],
               "type": {
@@ -28869,7 +35483,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "LocalizedString",
+                      "name": "Address",
                       "ofType": null
                     }
                   }
@@ -28879,7 +35493,31 @@
               "deprecationReason": null
             },
             {
-              "name": "ancestorsRef",
+              "name": "defaultShippingAddressId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "defaultBillingAddressId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shippingAddressIds",
               "description": null,
               "args": [],
               "type": {
@@ -28892,8 +35530,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Reference",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
                   }
@@ -28903,7 +35541,7 @@
               "deprecationReason": null
             },
             {
-              "name": "ancestors",
+              "name": "billingAddressIds",
               "description": null,
               "args": [],
               "type": {
@@ -28916,8 +35554,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Category",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
                   }
@@ -28927,7 +35565,23 @@
               "deprecationReason": null
             },
             {
-              "name": "parentRef",
+              "name": "isEmailVerified",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customerGroupRef",
               "description": null,
               "args": [],
               "type": {
@@ -28939,35 +35593,31 @@
               "deprecationReason": null
             },
             {
-              "name": "parent",
+              "name": "externalId",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Category",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "orderHint",
+              "name": "key",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "externalId",
+              "name": "firstName",
               "description": null,
               "args": [],
               "type": {
@@ -28979,38 +35629,9 @@
               "deprecationReason": null
             },
             {
-              "name": "metaTitle",
+              "name": "lastName",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
+              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -29020,38 +35641,9 @@
               "deprecationReason": null
             },
             {
-              "name": "metaKeywords",
+              "name": "middleName",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
+              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -29061,38 +35653,9 @@
               "deprecationReason": null
             },
             {
-              "name": "metaDescription",
+              "name": "title",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
+              "args": [],
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -29102,67 +35665,119 @@
               "deprecationReason": null
             },
             {
-              "name": "productCount",
-              "description": "Number of a products in the category subtree.",
+              "name": "locale",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Locale",
+                "ofType": null
               },
-              "isDeprecated": true,
-              "deprecationReason": "The returned number is representing only staged products. Use 'stagedProductCount' instead"
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "stagedProductCount",
-              "description": "Number of staged products in the category subtree.",
+              "name": "salutation",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "childCount",
-              "description": "Number of direct child categories.",
+              "name": "dateOfBirth",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Date",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "children",
-              "description": "Direct child categories.",
+              "name": "companyName",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "LIST",
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "vatId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customerGroup",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CustomerGroup",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "defaultShippingAddress",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Address",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "defaultBillingAddress",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Address",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shippingAddresses",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
+                  "kind": "LIST",
                   "name": null,
                   "ofType": {
-                    "kind": "OBJECT",
-                    "name": "Category",
-                    "ofType": null
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Address",
+                      "ofType": null
+                    }
                   }
                 }
               },
@@ -29170,39 +35785,55 @@
               "deprecationReason": null
             },
             {
-              "name": "createdAt",
+              "name": "billingAddresses",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Address",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedAt",
+              "name": "storesRef",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "KeyReference",
+                      "ofType": null
+                    }
+                  }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
             },
             {
-              "name": "assets",
+              "name": "stores",
               "description": null,
               "args": [],
               "type": {
@@ -29216,14 +35847,14 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "Asset",
+                      "name": "Store",
                       "ofType": null
                     }
                   }
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
             },
             {
               "name": "customFieldsRaw",
@@ -29283,19 +35914,83 @@
               "deprecationReason": null
             },
             {
-              "name": "createdBy",
-              "description": null,
+              "name": "customFields",
+              "description": "This field would contain type data",
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Initiator",
+                "kind": "INTERFACE",
+                "name": "Type",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedBy",
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "version",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdBy",
               "description": null,
               "args": [],
               "type": {
@@ -29307,12 +36002,12 @@
               "deprecationReason": null
             },
             {
-              "name": "customFields",
-              "description": "Custom fields",
+              "name": "lastModifiedBy",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
+                "kind": "OBJECT",
+                "name": "Initiator",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -29388,55 +36083,61 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "CategoryOrderHint",
-          "description": null,
+          "kind": "INTERFACE",
+          "name": "CustomerActiveCartInterface",
+          "description": "A field to access a customer's active cart.",
           "fields": [
             {
-              "name": "categoryId",
+              "name": "customerActiveCart",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+              "args": [
+                {
+                  "name": "customerId",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
                 }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "orderHint",
-              "description": null,
-              "args": [],
+              ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Cart",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             }
           ],
           "inputFields": null,
-          "interfaces": [],
+          "interfaces": null,
           "enumValues": null,
-          "possibleTypes": null
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "InStore",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Query",
+              "ofType": null
+            }
+          ]
         },
         {
           "kind": "OBJECT",
-          "name": "CategoryQueryResult",
-          "description": null,
+          "name": "CustomerGroup",
+          "description": "A customer can be a member in a customer group (e.g. reseller, gold member). A customer group can be used in price calculations with special prices being assigned to certain customer groups.",
           "fields": [
             {
-              "name": "offset",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -29444,7 +36145,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -29452,7 +36153,7 @@
               "deprecationReason": null
             },
             {
-              "name": "count",
+              "name": "version",
               "description": null,
               "args": [],
               "type": {
@@ -29460,7 +36161,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "Long",
                   "ofType": null
                 }
               },
@@ -29468,7 +36169,7 @@
               "deprecationReason": null
             },
             {
-              "name": "total",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
@@ -29476,7 +36177,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Long",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -29484,42 +36185,35 @@
               "deprecationReason": null
             },
             {
-              "name": "results",
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Category",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "CategorySearch",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "id",
+              "name": "lastModifiedAt",
               "description": null,
               "args": [],
               "type": {
@@ -29527,7 +36221,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "DateTime",
                   "ofType": null
                 }
               },
@@ -29535,22 +36229,30 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
-              "description": null,
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
               "args": [
                 {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -29559,7 +36261,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "Locale",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -29568,115 +36270,82 @@
                 }
               ],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "RawCustomField",
+                    "ofType": null
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "nameAllLocales",
-              "description": null,
+              "name": "customFields",
+              "description": "This field would contain type data",
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "LocalizedString",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "description",
+              "name": "createdBy",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
+              "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "Initiator",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "descriptionAllLocales",
+              "name": "lastModifiedBy",
               "description": null,
               "args": [],
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "LocalizedString",
-                    "ofType": null
-                  }
-                }
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "slug",
-              "description": null,
+              "name": "customFieldList",
+              "description": "Custom fields are returned as a list instead of an object structure.",
               "args": [
                 {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -29685,7 +36354,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "Locale",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -29694,139 +36363,123 @@
                 }
               ],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "slugAllLocales",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
+                  "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "LocalizedString",
-                      "ofType": null
-                    }
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
+                    "ofType": null
                   }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "ancestorsRef",
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "CustomerGroupQueryResult",
+          "description": null,
+          "fields": [
+            {
+              "name": "offset",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Reference",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "ancestors",
+              "name": "count",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "CategorySearch",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "parentRef",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Reference",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "parent",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "CategorySearch",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "externalId",
+              "name": "total",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "productCount",
+              "name": "results",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CustomerGroup",
+                      "ofType": null
+                    }
+                  }
                 }
               },
-              "isDeprecated": true,
-              "deprecationReason": "The returned number is representing only staged products. Use 'stagedProductCount' instead"
-            },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "CustomerQueryResult",
+          "description": null,
+          "fields": [
             {
-              "name": "stagedProductCount",
+              "name": "offset",
               "description": null,
               "args": [],
               "type": {
@@ -29842,7 +36495,7 @@
               "deprecationReason": null
             },
             {
-              "name": "childCount",
+              "name": "count",
               "description": null,
               "args": [],
               "type": {
@@ -29858,32 +36511,24 @@
               "deprecationReason": null
             },
             {
-              "name": "productTypeNames",
+              "name": "total",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "children",
-              "description": "Direct child categories.",
+              "name": "results",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
@@ -29896,7 +36541,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "CategorySearch",
+                      "name": "Customer",
                       "ofType": null
                     }
                   }
@@ -29904,9 +36549,40 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "Date",
+          "description": "DateTime is a scalar value that represents an ISO8601 formatted date.",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "DateTime",
+          "description": "DateTime is a scalar value that represents an ISO8601 formatted date and time.",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Delivery",
+          "description": null,
+          "fields": [
             {
-              "name": "createdAt",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -29914,7 +36590,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "DateTime",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -29922,7 +36598,7 @@
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedAt",
+              "name": "createdAt",
               "description": null,
               "args": [],
               "type": {
@@ -29938,23 +36614,31 @@
               "deprecationReason": null
             },
             {
-              "name": "orderHint",
+              "name": "items",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "DeliveryItem",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "assets",
+              "name": "parcels",
               "description": null,
               "args": [],
               "type": {
@@ -29968,7 +36652,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "Asset",
+                      "name": "Parcel",
                       "ofType": null
                     }
                   }
@@ -29978,73 +36662,16 @@
               "deprecationReason": null
             },
             {
-              "name": "customFields",
-              "description": "Custom fields",
+              "name": "address",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
+                "kind": "OBJECT",
+                "name": "Address",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "customFieldList",
-              "description": "Custom fields are returned as a list instead of an object structure.",
-              "args": [
-                {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INTERFACE",
-                    "name": "CustomField",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -30054,11 +36681,11 @@
         },
         {
           "kind": "OBJECT",
-          "name": "CategorySearchResult",
+          "name": "DeliveryItem",
           "description": null,
           "fields": [
             {
-              "name": "offset",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -30066,7 +36693,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -30074,7 +36701,7 @@
               "deprecationReason": null
             },
             {
-              "name": "count",
+              "name": "quantity",
               "description": null,
               "args": [],
               "type": {
@@ -30082,15 +36709,26 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "Long",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Dimensions",
+          "description": null,
+          "fields": [
             {
-              "name": "total",
+              "name": "width",
               "description": null,
               "args": [],
               "type": {
@@ -30106,24 +36744,16 @@
               "deprecationReason": null
             },
             {
-              "name": "results",
+              "name": "height",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "CategorySearch",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
@@ -30137,11 +36767,11 @@
         },
         {
           "kind": "OBJECT",
-          "name": "Channel",
-          "description": null,
+          "name": "DiscountCode",
+          "description": "With discount codes it is possible to give specific cart discounts to an eligible amount of users. They are defined by a string value which can be added to a cart so that specific cart discounts can be applied to the cart.",
           "fields": [
             {
-              "name": "id",
+              "name": "code",
               "description": null,
               "args": [],
               "type": {
@@ -30157,7 +36787,7 @@
               "deprecationReason": null
             },
             {
-              "name": "version",
+              "name": "isActive",
               "description": null,
               "args": [],
               "type": {
@@ -30165,7 +36795,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Long",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
@@ -30173,23 +36803,79 @@
               "deprecationReason": null
             },
             {
-              "name": "key",
+              "name": "maxApplications",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Long",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "roles",
+              "name": "maxApplicationsPerCustomer",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Long",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "cartPredicate",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "applicationVersion",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Long",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "validFrom",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "validUntil",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "groups",
               "description": null,
               "args": [],
               "type": {
@@ -30202,8 +36888,8 @@
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "ENUM",
-                      "name": "ChannelRole",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
                   }
@@ -30218,7 +36904,48 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "description",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -30253,6 +36980,30 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "cartDiscounts",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CartDiscount",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "nameAllLocales",
               "description": null,
@@ -30274,22 +37025,50 @@
               "deprecationReason": null
             },
             {
-              "name": "description",
+              "name": "descriptionAllLocales",
               "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedString",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
               "args": [
                 {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -30298,7 +37077,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "Locale",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -30307,27 +37086,67 @@
                 }
               ],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "RawCustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFields",
+              "description": "This field would contain type data",
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "Type",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "descriptionAllLocales",
+              "name": "applicationCount",
+              "description": "How many times this discount code was applied (only applications that were part of a successful checkout are considered)",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "cartDiscountRefs",
               "description": null,
               "args": [],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
+                  "kind": "LIST",
                   "name": null,
                   "ofType": {
-                    "kind": "OBJECT",
-                    "name": "LocalizedString",
-                    "ofType": null
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Reference",
+                      "ofType": null
+                    }
                   }
                 }
               },
@@ -30335,13 +37154,33 @@
               "deprecationReason": null
             },
             {
-              "name": "address",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Address",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "version",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -30363,28 +37202,52 @@
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedAt",
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedBy",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFieldsRaw",
-              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "name": "customFieldList",
+              "description": "Custom fields are returned as a list instead of an object structure.",
               "args": [
                 {
                   "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -30402,7 +37265,7 @@
                 },
                 {
                   "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -30426,34 +37289,67 @@
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "OBJECT",
-                    "name": "RawCustomField",
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
                     "ofType": null
                   }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "DiscountCodeInfo",
+          "description": null,
+          "fields": [
+            {
+              "name": "discountCodeRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Reference",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "createdBy",
+              "name": "state",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Initiator",
+                "kind": "ENUM",
+                "name": "DiscountCodeState",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedBy",
+              "name": "discountCode",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Initiator",
+                "name": "DiscountCode",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -30461,19 +37357,13 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "Versioned",
-              "ofType": null
-            }
-          ],
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "ChannelQueryResult",
+          "name": "DiscountCodeQueryResult",
           "description": null,
           "fields": [
             {
@@ -30539,7 +37429,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "Channel",
+                      "name": "DiscountCode",
                       "ofType": null
                     }
                   }
@@ -30556,39 +37446,45 @@
         },
         {
           "kind": "ENUM",
-          "name": "ChannelRole",
+          "name": "DiscountCodeState",
           "description": null,
           "fields": null,
           "inputFields": null,
           "interfaces": null,
           "enumValues": [
             {
-              "name": "InventorySupply",
-              "description": "Role tells that this channel can be used to track inventory entries.Channels with this role can be treated as warehouses",
+              "name": "ApplicationStoppedByPreviousDiscount",
+              "description": "The discount code is active and none of the discounts were applied because the discount application was stopped by one discount that has the StackingMode of StopAfterThisDiscount defined",
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "ProductDistribution",
-              "description": "Role tells that this channel can be used to expose products to a specific distribution channel. It can be used by the cart to select a product price.",
+              "name": "NotValid",
+              "description": "The discount code is not valid or it does not contain any valid cart discounts. Validity is determined based on the validFrom and validUntil dates",
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "OrderExport",
-              "description": "Role tells that this channel can be used to track order export activities.",
+              "name": "MaxApplicationReached",
+              "description": "maxApplications or maxApplicationsPerCustomer for discountCode has been reached.",
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "OrderImport",
-              "description": "Role tells that this channel can be used to track order import activities.",
+              "name": "MatchesCart",
+              "description": "The discount code is active and it contains at least one active and valid CartDiscount. The discount code cartPredicate matches the cart and at least one of the contained active discount’s cart predicates matches the cart.",
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "Primary",
-              "description": "This role can be combined with some other roles (e.g. with `InventorySupply`) to represent the fact that this particular channel is the primary/master channel among the channels of the same type.",
+              "name": "DoesNotMatchCart",
+              "description": "The discount code is active and it contains at least one active and valid CartDiscount. But its cart predicate does not match the cart or none of the contained active discount’s cart predicates match the cart",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "NotActive",
+              "description": "The discount code is not active or it does not contain any active cart discounts.",
               "isDeprecated": false,
               "deprecationReason": null
             }
@@ -30596,32 +37492,118 @@
           "possibleTypes": null
         },
         {
-          "kind": "SCALAR",
-          "name": "Country",
-          "description": "[ISO 3166-1](http://en.wikipedia.org/wiki/ISO_3166-1) country code.",
-          "fields": null,
+          "kind": "OBJECT",
+          "name": "DiscountedLineItemPortion",
+          "description": null,
+          "fields": [
+            {
+              "name": "discount",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CartDiscount",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "discountRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Reference",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "discountedAmount",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "BaseMoney",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "SCALAR",
-          "name": "Currency",
-          "description": "Represents a currency. Currencies are identified by their [ISO 4217](http://www.iso.org/iso/home/standards/currency_codes.htm) currency codes.",
-          "fields": null,
+          "kind": "OBJECT",
+          "name": "DiscountedLineItemPrice",
+          "description": null,
+          "fields": [
+            {
+              "name": "value",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "BaseMoney",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "includedDiscounts",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "DiscountedLineItemPortion",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "INTERFACE",
-          "name": "CustomField",
+          "kind": "OBJECT",
+          "name": "DiscountedLineItemPriceForQuantity",
           "description": null,
           "fields": [
             {
-              "name": "name",
+              "name": "quantity",
               "description": null,
               "args": [],
               "type": {
@@ -30629,7 +37611,23 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "discountedPrice",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "DiscountedLineItemPrice",
                   "ofType": null
                 }
               },
@@ -30638,73 +37636,127 @@
             }
           ],
           "inputFields": null,
-          "interfaces": null,
+          "interfaces": [],
           "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "BooleanField",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "DateField",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "DateTimeField",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "EnumField",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "LocalizedEnumField",
-              "ofType": null
-            },
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "DiscountedProductPriceValue",
+          "description": null,
+          "fields": [
             {
-              "kind": "OBJECT",
-              "name": "LocalizedStringField",
-              "ofType": null
+              "name": "value",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INTERFACE",
+                  "name": "BaseMoney",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "OBJECT",
-              "name": "MoneyField",
-              "ofType": null
+              "name": "discountRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Reference",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "OBJECT",
-              "name": "NumberField",
-              "ofType": null
+              "name": "discount",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ProductDiscount",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "OBJECT",
-              "name": "ReferenceField",
-              "ofType": null
-            },
+              "name": "discountRel",
+              "description": "Temporal. Will be renamed some time in the future. Please use 'discount'.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ProductDiscount",
+                "ofType": null
+              },
+              "isDeprecated": true,
+              "deprecationReason": "Will be removed in the future. Please use 'discount'."
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "ExternalOAuth",
+          "description": null,
+          "fields": [
             {
-              "kind": "OBJECT",
-              "name": "StringField",
-              "ofType": null
+              "name": "url",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "OBJECT",
-              "name": "TimeField",
-              "ofType": null
+              "name": "authorizationHeader",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
-          ]
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "CustomLineItem",
-          "description": "A custom line item is a generic item that can be added to the cart but is not bound to a product. You can use it for discounts (negative money), vouchers, complex cart rules, additional services or fees. You control the lifecycle of this item.",
+          "name": "FieldDefinition",
+          "description": "Field definitions describe custom fields and allow you to define some meta-information associated with the field.",
           "fields": [
             {
-              "name": "id",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
@@ -30720,12 +37772,44 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "required",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "inputHint",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "TextInputHint",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "label",
               "description": null,
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -30761,7 +37845,7 @@
               "deprecationReason": null
             },
             {
-              "name": "nameAllLocales",
+              "name": "labelAllLocales",
               "description": null,
               "args": [],
               "type": {
@@ -30785,7 +37869,7 @@
               "deprecationReason": null
             },
             {
-              "name": "money",
+              "name": "type",
               "description": null,
               "args": [],
               "type": {
@@ -30793,31 +37877,114 @@
                 "name": null,
                 "ofType": {
                   "kind": "INTERFACE",
-                  "name": "BaseMoney",
+                  "name": "FieldType",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "FieldType",
+          "description": null,
+          "fields": [
             {
-              "name": "totalPrice",
+              "name": "name",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Money",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "BooleanType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "DateTimeType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "DateType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "EnumType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "LocalizedEnumType",
+              "ofType": null
             },
             {
-              "name": "slug",
+              "kind": "OBJECT",
+              "name": "LocalizedStringType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "MoneyType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "NumberType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "ReferenceType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "SetType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "StringType",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "TimeType",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Image",
+          "description": null,
+          "fields": [
+            {
+              "name": "url",
               "description": null,
               "args": [],
               "type": {
@@ -30833,15 +38000,15 @@
               "deprecationReason": null
             },
             {
-              "name": "quantity",
+              "name": "dimensions",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
+                  "kind": "OBJECT",
+                  "name": "Dimensions",
                   "ofType": null
                 }
               },
@@ -30849,114 +38016,88 @@
               "deprecationReason": null
             },
             {
-              "name": "state",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "ItemState",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "taxCategory",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "TaxCategory",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "taxCategoryRef",
+              "name": "label",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Reference",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "InStore",
+          "description": null,
+          "fields": [
             {
-              "name": "taxRate",
-              "description": null,
+              "name": "me",
+              "description": "This field can only be used with an access token created with the password flow or with an anonymous session.\n\nIt gives access to the data that is specific to the customer or the anonymous session linked to the access token.",
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "TaxRate",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "InStoreMe",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discountedPricePerQuantity",
+              "name": "cart",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
+              "args": [
+                {
+                  "name": "id",
+                  "description": null,
+                  "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "OBJECT",
-                      "name": "DiscountedLineItemPriceForQuantity",
+                      "kind": "SCALAR",
+                      "name": "String",
                       "ofType": null
                     }
-                  }
+                  },
+                  "defaultValue": null
                 }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Cart",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFieldsRaw",
-              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "name": "carts",
+              "description": null,
               "args": [
                 {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "where",
+                  "description": null,
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "sort",
+                  "description": null,
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -30971,73 +38112,117 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "RawCustomField",
-                    "ofType": null
-                  }
+                  "kind": "OBJECT",
+                  "name": "CartQueryResult",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "shippingDetails",
+              "name": "customerActiveCart",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "customerId",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "OBJECT",
-                "name": "ItemShippingDetails",
+                "name": "Cart",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFields",
-              "description": "Custom fields",
-              "args": [],
+              "name": "order",
+              "description": null,
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "orderNumber",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
+                "kind": "OBJECT",
+                "name": "Order",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFieldList",
-              "description": "Custom fields are returned as a list instead of an object structure.",
+              "name": "orders",
+              "description": null,
               "args": [
                 {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "name": "where",
+                  "description": null,
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "name": "sort",
+                  "description": null,
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -31052,19 +38237,35 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INTERFACE",
-                    "name": "CustomField",
-                    "ofType": null
-                  }
+                  "kind": "OBJECT",
+                  "name": "OrderQueryResult",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
@@ -31072,53 +38273,122 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [],
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "CartQueryInterface",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "CustomerActiveCartInterface",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "OrderQueryInterface",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "MeFieldInterface",
+              "ofType": null
+            }
+          ],
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "Customer",
-          "description": "A customer is a person purchasing products. Carts, Orders and Reviews can be associated to a customer.",
+          "name": "InStoreMe",
+          "description": null,
           "fields": [
             {
-              "name": "customerNumber",
+              "name": "cart",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "id",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "Cart",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "email",
+              "name": "carts",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+              "args": [
+                {
+                  "name": "where",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sort",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "password",
-              "description": null,
-              "args": [],
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "OBJECT",
+                  "name": "CartQueryResult",
                   "ofType": null
                 }
               },
@@ -31126,119 +38396,146 @@
               "deprecationReason": null
             },
             {
-              "name": "addresses",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Address",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "defaultShippingAddressId",
+              "name": "activeCart",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "Cart",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "defaultBillingAddressId",
+              "name": "order",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "orderNumber",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "Order",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "shippingAddressIds",
+              "name": "orders",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
+              "args": [
+                {
+                  "name": "where",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sort",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
                     "name": null,
                     "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
                     }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "billingAddressIds",
-              "description": null,
-              "args": [],
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "OBJECT",
+                  "name": "OrderQueryResult",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "isEmailVerified",
+              "kind": "INTERFACE",
+              "name": "MeQueryInterface",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Initiator",
+          "description": null,
+          "fields": [
+            {
+              "name": "isPlatformClient",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customerGroupRef",
+              "name": "user",
               "description": null,
               "args": [],
               "type": {
@@ -31250,7 +38547,7 @@
               "deprecationReason": null
             },
             {
-              "name": "externalId",
+              "name": "externalUserId",
               "description": null,
               "args": [],
               "type": {
@@ -31262,31 +38559,31 @@
               "deprecationReason": null
             },
             {
-              "name": "key",
+              "name": "customer",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "Reference",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "dateOfBirth",
+              "name": "anonymousId",
               "description": null,
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "companyName",
+              "name": "clientId",
               "description": null,
               "args": [],
               "type": {
@@ -31296,171 +38593,273 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "InterfaceInteractionsRaw",
+          "description": null,
+          "fields": [
             {
-              "name": "vatId",
+              "name": "typeRef",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Reference",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "firstName",
+              "name": "type",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "TypeDefinition",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "lastName",
+              "name": "fields",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "RawCustomField",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "InterfaceInteractionsRawResult",
+          "description": null,
+          "fields": [
             {
-              "name": "middleName",
+              "name": "limit",
               "description": null,
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Int",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "title",
+              "name": "offset",
               "description": null,
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Int",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "locale",
+              "name": "total",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Locale",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "salutation",
+              "name": "results",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "InterfaceInteractionsRaw",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "InventoryEntry",
+          "description": "Inventory allows you to track stock quantity per SKU and optionally per supply channel",
+          "fields": [
             {
-              "name": "customerGroup",
+              "name": "sku",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "CustomerGroup",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "defaultShippingAddress",
+              "name": "supplyChannel",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Address",
+                "name": "Reference",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "defaultBillingAddress",
+              "name": "quantityOnStock",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Address",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "shippingAddresses",
+              "name": "availableQuantity",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Address",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "billingAddresses",
+              "name": "restockableInDays",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Address",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "expectedDelivery",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -31522,6 +38921,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "customFields",
+              "description": "This field would contain type data",
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "id",
               "description": null,
@@ -31610,18 +39021,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "customFields",
-              "description": "Custom fields",
-              "args": [],
-              "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "customFieldList",
               "description": "Custom fields are returned as a list instead of an object structure.",
@@ -31662,18 +39061,230 @@
                   },
                   "defaultValue": null
                 }
-              ],
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "InventoryEntryQueryResult",
+          "description": null,
+          "fields": [
+            {
+              "name": "offset",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "count",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "total",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "InventoryEntry",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "InventoryMode",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "None",
+              "description": "Adding items to cart and ordering is independent of inventory. No inventory checks or modifications.\nThis is the default mode for a new cart.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "ReserveOnOrder",
+              "description": "Creating an order will fail with an OutOfStock error if an unavailable line item exists. Line items in the cart\nare only reserved for the duration of the ordering transaction.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "TrackOnly",
+              "description": "Orders are tracked on inventory. That means, ordering a LineItem will decrement the available quantity on the\nrespective InventoryEntry. Creating an order will succeed even if the line item’s available quantity is zero or\nnegative. But creating an order will fail with an OutOfStock error if no matching inventory entry exists for a\nline item.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "ItemShippingDetails",
+          "description": null,
+          "fields": [
+            {
+              "name": "targets",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "ItemShippingTarget",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "valid",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "ItemShippingTarget",
+          "description": null,
+          "fields": [
+            {
+              "name": "addressKey",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "quantity",
+              "description": null,
+              "args": [],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INTERFACE",
-                    "name": "CustomField",
-                    "ofType": null
-                  }
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
@@ -31681,23 +39292,17 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "Versioned",
-              "ofType": null
-            }
-          ],
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "CustomerGroup",
-          "description": "A customer can be a member in a customer group (e.g. reseller, gold member). A customer group can be used in price calculations with special prices being assigned to certain customer groups.",
+          "name": "ItemState",
+          "description": null,
           "fields": [
             {
-              "name": "id",
+              "name": "quantity",
               "description": null,
               "args": [],
               "type": {
@@ -31705,7 +39310,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Long",
                   "ofType": null
                 }
               },
@@ -31713,15 +39318,15 @@
               "deprecationReason": null
             },
             {
-              "name": "version",
+              "name": "stateRef",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
+                  "kind": "OBJECT",
+                  "name": "Reference",
                   "ofType": null
                 }
               },
@@ -31729,7 +39334,40 @@
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "state",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "State",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "Json",
+          "description": "Raw JSON value",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "KeyReference",
+          "description": null,
+          "fields": [
+            {
+              "name": "typeId",
               "description": null,
               "args": [],
               "type": {
@@ -31749,15 +39387,40 @@
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "KeyReferenceInput",
+          "description": "A key that references a resource.",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "LineItem",
+          "description": "A line item is a snapshot of a product variant at the time it was added to the cart.\n\nSince a product variant may change at any time, the ProductVariant data is copied into the field variant.\nThe relation to the Product is kept but the line item will not automatically update if the product variant changes.\nOn the cart, the line item can be updated manually. The productSlug refers to the current version of the product.\nIt can be used to link to the product. If the product has been deleted, the line item remains but refers to a\nnon-existent product and the productSlug is left empty.\n\nPlease also note that creating an order is impossible if the product or product variant a line item relates to has been deleted.",
+          "fields": [
             {
-              "name": "createdAt",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -31765,7 +39428,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "DateTime",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -31773,7 +39436,7 @@
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedAt",
+              "name": "productId",
               "description": null,
               "args": [],
               "type": {
@@ -31781,7 +39444,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "DateTime",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -31789,12 +39452,22 @@
               "deprecationReason": null
             },
             {
-              "name": "customFieldsRaw",
-              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "name": "name",
+              "description": null,
               "args": [
                 {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -31803,16 +39476,63 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "String",
+                        "name": "Locale",
                         "ofType": null
                       }
                     }
                   },
                   "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "nameAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "LocalizedString",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "productSlug",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 },
                 {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -31821,7 +39541,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "String",
+                        "name": "Locale",
                         "ofType": null
                       }
                     }
@@ -31830,165 +39550,91 @@
                 }
               ],
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "RawCustomField",
-                    "ofType": null
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "createdBy",
+              "name": "productType",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Initiator",
+                "name": "ProductTypeDefinition",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedBy",
+              "name": "productTypeRef",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Initiator",
+                "name": "Reference",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFields",
-              "description": "Custom fields",
+              "name": "variant",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
+                "kind": "OBJECT",
+                "name": "ProductVariant",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFieldList",
-              "description": "Custom fields are returned as a list instead of an object structure.",
-              "args": [
-                {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
+              "name": "price",
+              "description": null,
+              "args": [],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INTERFACE",
-                    "name": "CustomField",
-                    "ofType": null
-                  }
+                  "kind": "OBJECT",
+                  "name": "ProductPrice",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "Versioned",
-              "ofType": null
-            }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "CustomerGroupQueryResult",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "offset",
+              "name": "taxedPrice",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "TaxedItemPrice",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "count",
+              "name": "totalPrice",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Money",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "total",
+              "name": "quantity",
               "description": null,
               "args": [],
               "type": {
@@ -32004,7 +39650,7 @@
               "deprecationReason": null
             },
             {
-              "name": "results",
+              "name": "state",
               "description": null,
               "args": [],
               "type": {
@@ -32018,7 +39664,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "CustomerGroup",
+                      "name": "ItemState",
                       "ofType": null
                     }
                   }
@@ -32026,68 +39672,69 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "CustomerQueryResult",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "offset",
+              "name": "taxRate",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "TaxRate",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "count",
+              "name": "supplyChannel",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Channel",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "total",
+              "name": "supplyChannelRef",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Reference",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "results",
+              "name": "distributionChannel",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Channel",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "distributionChannelRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Reference",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "discountedPricePerQuantity",
               "description": null,
               "args": [],
               "type": {
@@ -32101,7 +39748,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "Customer",
+                      "name": "DiscountedLineItemPriceForQuantity",
                       "ofType": null
                     }
                   }
@@ -32109,143 +39756,225 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "SCALAR",
-          "name": "Date",
-          "description": "DateTime is a scalar value that represents an ISO8601 formatted date.",
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "SCALAR",
-          "name": "DateTime",
-          "description": "DateTime is a scalar value that represents an ISO8601 formatted date and time.",
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Delivery",
-          "description": null,
-          "fields": [
+            },
+            {
+              "name": "priceMode",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "LineItemPriceMode",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customFieldsRaw",
+              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "RawCustomField",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
-              "name": "id",
-              "description": null,
+              "name": "customFields",
+              "description": "This field would contain type data",
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "createdAt",
+              "name": "shippingDetails",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "ItemShippingDetails",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "items",
+              "name": "inventoryMode",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "DeliveryItem",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "OBJECT",
+                "name": "ItemShippingDetails",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "parcels",
-              "description": null,
-              "args": [],
+              "name": "customFieldList",
+              "description": "Custom fields are returned as a list instead of an object structure.",
+              "args": [
+                {
+                  "name": "includeNames",
+                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeNames",
+                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
+                  "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Parcel",
-                      "ofType": null
-                    }
+                    "kind": "INTERFACE",
+                    "name": "CustomField",
+                    "ofType": null
                   }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "LineItemPriceMode",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "Platform",
+              "description": "The price is selected form the product variant. This is the default mode.",
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "address",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Address",
-                "ofType": null
-              },
+              "name": "ExternalPrice",
+              "description": "The line item price was set externally. Cart discounts can apply to line items with this price mode. All update actions that change the quantity of a line item with this price mode require the externalPrice field to be given.",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "ExternalTotal",
+              "description": "The line item price with the total was set externally.",
               "isDeprecated": false,
               "deprecationReason": null
             }
           ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "SCALAR",
+          "name": "Locale",
+          "description": "Locale is a scalar value represented as a string language tag.",
+          "fields": null,
           "inputFields": null,
-          "interfaces": [],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "DeliveryItem",
+          "name": "LocalizedString",
           "description": null,
           "fields": [
             {
-              "name": "id",
+              "name": "locale",
               "description": null,
               "args": [],
               "type": {
@@ -32253,7 +39982,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Locale",
                   "ofType": null
                 }
               },
@@ -32261,7 +39990,7 @@
               "deprecationReason": null
             },
             {
-              "name": "quantity",
+              "name": "value",
               "description": null,
               "args": [],
               "type": {
@@ -32269,7 +39998,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Long",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -32283,71 +40012,51 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "Dimensions",
+          "kind": "INPUT_OBJECT",
+          "name": "LocalizedText",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": [
             {
-              "name": "width",
+              "name": "text",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             },
             {
-              "name": "height",
+              "name": "locale",
               "description": null,
-              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "Locale",
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "defaultValue": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [],
+          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "DiscountCode",
-          "description": "With discount codes it is possible to give specific cart discounts to an eligible amount of users. They are defined by a string value which can be added to a cart so that specific cart discounts can be applied to the cart.",
+          "name": "Location",
+          "description": null,
           "fields": [
             {
-              "name": "code",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "isActive",
+              "name": "country",
               "description": null,
               "args": [],
               "type": {
@@ -32355,7 +40064,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
+                  "name": "Country",
                   "ofType": null
                 }
               },
@@ -32363,31 +40072,7 @@
               "deprecationReason": null
             },
             {
-              "name": "maxApplications",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Long",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "maxApplicationsPerCustomer",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Long",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "cartPredicate",
+              "name": "state",
               "description": null,
               "args": [],
               "type": {
@@ -32397,54 +40082,38 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "applicationVersion",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Long",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "validFrom",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Me",
+          "description": null,
+          "fields": [
             {
-              "name": "validUntil",
+              "name": "customer",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
+                "kind": "OBJECT",
+                "name": "Customer",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "groups",
+              "name": "cart",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
+              "args": [
+                {
+                  "name": "id",
+                  "description": null,
+                  "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
@@ -32452,29 +40121,35 @@
                       "name": "String",
                       "ofType": null
                     }
-                  }
+                  },
+                  "defaultValue": null
                 }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Cart",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "carts",
               "description": null,
               "args": [
                 {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "name": "where",
+                  "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Locale",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "name": "sort",
+                  "description": null,
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -32483,128 +40158,108 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "Locale",
+                        "name": "String",
                         "ofType": null
                       }
                     }
                   },
                   "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "description",
-              "description": null,
-              "args": [
+                },
                 {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "name": "limit",
+                  "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Locale",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "name": "offset",
+                  "description": null,
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "CartQueryResult",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "nameAllLocales",
+              "name": "activeCart",
               "description": null,
               "args": [],
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "LocalizedString",
-                    "ofType": null
-                  }
-                }
+                "kind": "OBJECT",
+                "name": "Cart",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "descriptionAllLocales",
+              "name": "order",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "LocalizedString",
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
                     "ofType": null
-                  }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "orderNumber",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Order",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFieldsRaw",
-              "description": "This field contains non-typed data. Consider using `customFields` as a typed alternative.",
+              "name": "orders",
+              "description": null,
               "args": [
                 {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "where",
+                  "description": null,
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all custom fields are returned.",
+                  "name": "sort",
+                  "description": null,
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -32619,122 +40274,181 @@
                     }
                   },
                   "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "RawCustomField",
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
                     "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "applicationCount",
-              "description": "How many times this discount code was applied (only applications that were part of a successful checkout are considered)",
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "cartDiscounts",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "CartDiscount",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "id",
-              "description": null,
-              "args": [],
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "OBJECT",
+                  "name": "OrderQueryResult",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
             {
-              "name": "version",
+              "kind": "INTERFACE",
+              "name": "MeQueryInterface",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "MeFieldInterface",
+          "description": "The me field gives access to the data that is specific to the customer or anonymous session linked to the access token.",
+          "fields": [
+            {
+              "name": "me",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
+                  "kind": "INTERFACE",
+                  "name": "MeQueryInterface",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "InStore",
+              "ofType": null
             },
             {
-              "name": "createdAt",
+              "kind": "OBJECT",
+              "name": "Query",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "MeQueryInterface",
+          "description": null,
+          "fields": [
+            {
+              "name": "cart",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
-                  "ofType": null
+              "args": [
+                {
+                  "name": "id",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
                 }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Cart",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedAt",
+              "name": "carts",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "where",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sort",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
+                  "kind": "OBJECT",
+                  "name": "CartQueryResult",
                   "ofType": null
                 }
               },
@@ -32742,66 +40456,67 @@
               "deprecationReason": null
             },
             {
-              "name": "createdBy",
+              "name": "activeCart",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Initiator",
+                "name": "Cart",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "lastModifiedBy",
+              "name": "order",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "orderNumber",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "OBJECT",
-                "name": "Initiator",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "customFields",
-              "description": "Custom fields",
-              "args": [],
-              "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
+                "name": "Order",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFieldList",
-              "description": "Custom fields are returned as a list instead of an object structure.",
+              "name": "orders",
+              "description": null,
               "args": [
                 {
-                  "name": "includeNames",
-                  "description": "The names of the custom fields to include.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "name": "where",
+                  "description": null,
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "excludeNames",
-                  "description": "The names of the custom fields to exclude.\n\nIf neither `includeNames` nor `excludeNames` are provided, then all attributes are returned.",
+                  "name": "sort",
+                  "description": null,
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -32816,19 +40531,35 @@
                     }
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
-                "kind": "LIST",
+                "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INTERFACE",
-                    "name": "CustomField",
-                    "ofType": null
-                  }
+                  "kind": "OBJECT",
+                  "name": "OrderQueryResult",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
@@ -32836,31 +40567,36 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
             {
-              "kind": "INTERFACE",
-              "name": "Versioned",
+              "kind": "OBJECT",
+              "name": "InStoreMe",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Me",
               "ofType": null
             }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
+          ]
         },
         {
           "kind": "OBJECT",
-          "name": "DiscountCodeInfo",
+          "name": "MessagesConfiguration",
           "description": null,
           "fields": [
             {
-              "name": "discountCode",
+              "name": "enabled",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Reference",
+                  "kind": "SCALAR",
+                  "name": "Boolean",
                   "ofType": null
                 }
               },
@@ -32868,12 +40604,12 @@
               "deprecationReason": null
             },
             {
-              "name": "state",
+              "name": "deleteDaysAfterCreation",
               "description": null,
               "args": [],
               "type": {
-                "kind": "ENUM",
-                "name": "DiscountCodeState",
+                "kind": "SCALAR",
+                "name": "Int",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -32887,11 +40623,11 @@
         },
         {
           "kind": "OBJECT",
-          "name": "DiscountCodeQueryResult",
+          "name": "Money",
           "description": null,
           "fields": [
             {
-              "name": "offset",
+              "name": "type",
               "description": null,
               "args": [],
               "type": {
@@ -32899,7 +40635,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -32907,7 +40643,7 @@
               "deprecationReason": null
             },
             {
-              "name": "count",
+              "name": "currencyCode",
               "description": null,
               "args": [],
               "type": {
@@ -32915,7 +40651,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Int",
+                  "name": "Currency",
                   "ofType": null
                 }
               },
@@ -32923,7 +40659,7 @@
               "deprecationReason": null
             },
             {
-              "name": "total",
+              "name": "centAmount",
               "description": null,
               "args": [],
               "type": {
@@ -32939,24 +40675,16 @@
               "deprecationReason": null
             },
             {
-              "name": "results",
-              "description": null,
+              "name": "fractionDigits",
+              "description": "For the `Money` it equals to the default number of fraction digits used with the currency.",
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "DiscountCode",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
@@ -32964,139 +40692,71 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "DiscountCodeState",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "ApplicationStoppedByPreviousDiscount",
-              "description": "The discount code is active and none of the discounts were applied because the discount application was stopped by one discount that has the StackingMode of StopAfterThisDiscount defined",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "NotValid",
-              "description": "The discount code is not valid or it does not contain any valid cart discounts. Validity is determined based on the validFrom and validUntil dates",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "MaxApplicationReached",
-              "description": "maxApplications or maxApplicationsPerCustomer for discountCode has been reached.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "MatchesCart",
-              "description": "The discount code is active and it contains at least one active and valid CartDiscount. The discount code cartPredicate matches the cart and at least one of the contained active discount’s cart predicates matches the cart.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "DoesNotMatchCart",
-              "description": "The discount code is active and it contains at least one active and valid CartDiscount. But its cart predicate does not match the cart or none of the contained active discount’s cart predicates match the cart",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+          "interfaces": [
             {
-              "name": "NotActive",
-              "description": "The discount code is not active or it does not contain any active cart discounts.",
-              "isDeprecated": false,
-              "deprecationReason": null
+              "kind": "INTERFACE",
+              "name": "BaseMoney",
+              "ofType": null
             }
           ],
+          "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "DiscountedLineItemPortion",
-          "description": null,
+          "name": "Order",
+          "description": "An order can be created from a cart, usually after a checkout process has been completed.\n[documentation](https://docs.commercetools.com/http-api-projects-orders.html)",
           "fields": [
             {
-              "name": "discount",
+              "name": "customerId",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "CartDiscount",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discountRef",
+              "name": "customer",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Reference",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Customer",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discountedAmount",
+              "name": "customerEmail",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "BaseMoney",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "DiscountedLineItemPrice",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "value",
+              "name": "anonymousId",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "BaseMoney",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "includedDiscounts",
+              "name": "lineItems",
               "description": null,
               "args": [],
               "type": {
@@ -33110,7 +40770,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "DiscountedLineItemPortion",
+                      "name": "LineItem",
                       "ofType": null
                     }
                   }
@@ -33118,36 +40778,33 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "DiscountedLineItemPriceForQuantity",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "quantity",
+              "name": "customLineItems",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CustomLineItem",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discountedPrice",
+              "name": "totalPrice",
               "description": null,
               "args": [],
               "type": {
@@ -33155,105 +40812,75 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "DiscountedLineItemPrice",
+                  "name": "Money",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "DiscountedProductPriceValue",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "value",
+              "name": "taxedPrice",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "BaseMoney",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "TaxedPrice",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discount",
+              "name": "shippingAddress",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Reference",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Address",
+                "ofType": null
               },
-              "isDeprecated": true,
-              "deprecationReason": "Will be removed due to naming inconsistencies. Please use 'discountRef'."
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "discountRef",
+              "name": "billingAddress",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Reference",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Address",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discountRel",
-              "description": "Temporal. Will be renamed some time in the future",
+              "name": "inventoryMode",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "ProductDiscount",
-                "ofType": null
-              },
-              "isDeprecated": true,
-              "deprecationReason": "Will be removed in the future."
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "FieldDefinition",
-          "description": "Field definitions describe custom fields and allow you to define some meta-information associated with the field.",
-          "fields": [
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "InventoryMode",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
-              "name": "name",
+              "name": "taxMode",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "ENUM",
+                  "name": "TaxMode",
                   "ofType": null
                 }
               },
@@ -33261,15 +40888,15 @@
               "deprecationReason": null
             },
             {
-              "name": "required",
+              "name": "taxRoundingMode",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
+                  "kind": "ENUM",
+                  "name": "RoundingMode",
                   "ofType": null
                 }
               },
@@ -33277,7 +40904,7 @@
               "deprecationReason": null
             },
             {
-              "name": "inputHint",
+              "name": "taxCalculationMode",
               "description": null,
               "args": [],
               "type": {
@@ -33285,7 +40912,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "ENUM",
-                  "name": "TextInputHint",
+                  "name": "TaxCalculationMode",
                   "ofType": null
                 }
               },
@@ -33293,48 +40920,55 @@
               "deprecationReason": null
             },
             {
-              "name": "label",
+              "name": "customerGroup",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CustomerGroup",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customerGroupRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Reference",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "country",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Country",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "labelAllLocales",
+              "name": "shippingInfo",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ShippingInfo",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "discountCodes",
               "description": null,
               "args": [],
               "type": {
@@ -33348,7 +40982,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "LocalizedString",
+                      "name": "DiscountCodeInfo",
                       "ofType": null
                     }
                   }
@@ -33358,154 +40992,167 @@
               "deprecationReason": null
             },
             {
-              "name": "type",
+              "name": "refusedGifts",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "INTERFACE",
-                  "name": "FieldType",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "CartDiscount",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "INTERFACE",
-          "name": "FieldType",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "name",
+              "name": "refusedGiftsRefs",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Reference",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": [
-            {
-              "kind": "OBJECT",
-              "name": "BooleanType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "DateTimeType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "DateType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "EnumType",
-              "ofType": null
-            },
-            {
-              "kind": "OBJECT",
-              "name": "LocalizedEnumType",
-              "ofType": null
             },
             {
-              "kind": "OBJECT",
-              "name": "LocalizedStringType",
-              "ofType": null
+              "name": "paymentInfo",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "PaymentInfo",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "OBJECT",
-              "name": "MoneyType",
-              "ofType": null
+              "name": "locale",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Locale",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "OBJECT",
-              "name": "NumberType",
-              "ofType": null
+              "name": "shippingRateInput",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "ShippingRateInput",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "OBJECT",
-              "name": "ReferenceType",
-              "ofType": null
+              "name": "origin",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "CartOrigin",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "kind": "OBJECT",
-              "name": "SetType",
-              "ofType": null
+              "name": "storeRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "KeyReference",
+                "ofType": null
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
             },
             {
-              "kind": "OBJECT",
-              "name": "StringType",
-              "ofType": null
+              "name": "store",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Store",
+                "ofType": null
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
             },
             {
-              "kind": "OBJECT",
-              "name": "TimeType",
-              "ofType": null
-            }
-          ]
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Image",
-          "description": null,
-          "fields": [
-            {
-              "name": "url",
+              "name": "itemShippingAddresses",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Address",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "dimensions",
+              "name": "completedAt",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Dimensions",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "label",
+              "name": "orderNumber",
               "description": null,
               "args": [],
               "type": {
@@ -33515,28 +41162,17 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Initiator",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "clientId",
+              "name": "orderState",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "ENUM",
+                  "name": "OrderState",
                   "ofType": null
                 }
               },
@@ -33544,7 +41180,7 @@
               "deprecationReason": null
             },
             {
-              "name": "user",
+              "name": "stateRef",
               "description": null,
               "args": [],
               "type": {
@@ -33556,98 +41192,91 @@
               "deprecationReason": null
             },
             {
-              "name": "externalUserId",
+              "name": "state",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "State",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customer",
+              "name": "shipmentState",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Reference",
+                "kind": "ENUM",
+                "name": "ShipmentState",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "anonymousId",
+              "name": "paymentState",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "ENUM",
+                "name": "PaymentState",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "InventoryEntry",
-          "description": "Inventory allows you to track stock quantity per SKU and optionally per supply channel",
-          "fields": [
+            },
             {
-              "name": "sku",
+              "name": "syncInfo",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "SyncInfo",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "supplyChannel",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Reference",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "quantityOnStock",
+              "name": "returnInfo",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "ReturnInfo",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "availableQuantity",
+              "name": "lastMessageSequenceNumber",
               "description": null,
               "args": [],
               "type": {
@@ -33663,24 +41292,24 @@
               "deprecationReason": null
             },
             {
-              "name": "restockableInDays",
+              "name": "cartRef",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "OBJECT",
+                "name": "Reference",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "expectedDelivery",
+              "name": "cart",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "DateTime",
+                "kind": "OBJECT",
+                "name": "Cart",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -33743,6 +41372,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "customFields",
+              "description": "This field would contain type data",
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "Type",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "id",
               "description": null,
@@ -33831,18 +41472,6 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
-            {
-              "name": "customFields",
-              "description": "Custom fields",
-              "args": [],
-              "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "customFieldList",
               "description": "Custom fields are returned as a list instead of an object structure.",
@@ -33902,19 +41531,139 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "OrderQueryInterface",
+          "description": "Fields to access orders. Includes direct access to a single order and searching for orders.",
+          "fields": [
+            {
+              "name": "order",
+              "description": null,
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "orderNumber",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Order",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "orders",
+              "description": null,
+              "args": [
+                {
+                  "name": "where",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sort",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "OrderQueryResult",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": [
             {
-              "kind": "INTERFACE",
-              "name": "Versioned",
+              "kind": "OBJECT",
+              "name": "InStore",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Query",
               "ofType": null
             }
-          ],
-          "enumValues": null,
-          "possibleTypes": null
+          ]
         },
         {
           "kind": "OBJECT",
-          "name": "InventoryEntryQueryResult",
+          "name": "OrderQueryResult",
           "description": null,
           "fields": [
             {
@@ -33980,7 +41729,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "InventoryEntry",
+                      "name": "Order",
                       "ofType": null
                     }
                   }
@@ -33997,91 +41746,46 @@
         },
         {
           "kind": "ENUM",
-          "name": "InventoryMode",
+          "name": "OrderState",
           "description": null,
           "fields": null,
           "inputFields": null,
           "interfaces": null,
           "enumValues": [
             {
-              "name": "None",
-              "description": "Adding items to cart and ordering is independent of inventory. No inventory checks or modifications.\nThis is the default mode for a new cart.",
+              "name": "Confirmed",
+              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "ReserveOnOrder",
-              "description": "Creating an order will fail with an OutOfStock error if an unavailable line item exists. Line items in the cart\nare only reserved for the duration of the ordering transaction.",
+              "name": "Cancelled",
+              "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "TrackOnly",
-              "description": "Orders are tracked on inventory. That means, ordering a LineItem will decrement the available quantity on the\nrespective InventoryEntry. Creating an order will succeed even if the line item’s available quantity is zero or\nnegative. But creating an order will fail with an OutOfStock error if no matching inventory entry exists for a\nline item.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "ItemShippingDetails",
-          "description": null,
-          "fields": [
-            {
-              "name": "targets",
+              "name": "Complete",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "ItemShippingTarget",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "valid",
+              "name": "Open",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
-              },
               "isDeprecated": false,
               "deprecationReason": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "ItemShippingTarget",
+          "name": "Parcel",
           "description": null,
           "fields": [
             {
-              "name": "addressKey",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -34097,7 +41801,7 @@
               "deprecationReason": null
             },
             {
-              "name": "quantity",
+              "name": "createdAt",
               "description": null,
               "args": [],
               "type": {
@@ -34105,67 +41809,56 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Long",
+                  "name": "DateTime",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "ItemState",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "quantity",
+              "name": "measurements",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "ParcelMeasurements",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "stateRef",
+              "name": "trackingData",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Reference",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "TrackingData",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "state",
+              "name": "items",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "State",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "DeliveryItem",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
@@ -34177,173 +41870,84 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "SCALAR",
-          "name": "Json",
-          "description": "Raw JSON value",
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
-          "name": "LineItem",
-          "description": "A line item is a snapshot of a product variant at the time it was added to the cart.\n\nSince a product variant may change at any time, the ProductVariant data is copied into the field variant.\nThe relation to the Product is kept but the line item will not automatically update if the product variant changes.\nOn the cart, the line item can be updated manually. The productSlug refers to the current version of the product.\nIt can be used to link to the product. If the product has been deleted, the line item remains but refers to a\nnon-existent product and the productSlug is left empty.\n\nPlease also note that creating an order is impossible if the product or product variant a line item relates to has been deleted.",
+          "name": "ParcelMeasurements",
+          "description": null,
           "fields": [
             {
-              "name": "id",
+              "name": "heightInMillimeter",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "productId",
+              "name": "lengthInMillimeter",
               "description": null,
               "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "name",
-              "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Int",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "nameAllLocales",
+              "name": "widthInMillimeter",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "LocalizedString",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "productSlug",
+              "name": "weightInGram",
               "description": null,
-              "args": [
-                {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Locale",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "acceptLanguage",
-                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "Locale",
-                        "ofType": null
-                      }
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
+              "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Int",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "Payment",
+          "description": "Payments hold information about the current state of receiving and/or refunding money.\n[documentation](https://docs.commercetools.com/http-api-projects-payments)",
+          "fields": [
             {
-              "name": "productType",
+              "name": "key",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "ProductTypeDefinition",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "productTypeRef",
+              "name": "customerRef",
               "description": null,
               "args": [],
               "type": {
@@ -34355,71 +41959,51 @@
               "deprecationReason": null
             },
             {
-              "name": "variant",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "ProductVariant",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "price",
+              "name": "customer",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "ProductPrice",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Customer",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "taxedPrice",
+              "name": "anonymousId",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "TaxedItemPrice",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "totalPrice",
+              "name": "interfaceId",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Money",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "quantity",
+              "name": "amountPlanned",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
+                  "kind": "OBJECT",
+                  "name": "Money",
                   "ofType": null
                 }
               },
@@ -34427,91 +42011,87 @@
               "deprecationReason": null
             },
             {
-              "name": "state",
+              "name": "amountAuthorized",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "ItemState",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "OBJECT",
+                "name": "Money",
+                "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "https://docs.commercetools.com/release-notes.html#releases-2017-09-29-payment-api-beta-changes"
             },
             {
-              "name": "taxRate",
+              "name": "authorizedUntil",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "TaxRate",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "https://docs.commercetools.com/release-notes.html#releases-2017-09-29-payment-api-beta-changes"
             },
             {
-              "name": "supplyChannel",
+              "name": "amountPaid",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Channel",
+                "name": "Money",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "https://docs.commercetools.com/release-notes.html#releases-2017-09-29-payment-api-beta-changes"
             },
             {
-              "name": "supplyChannelRef",
+              "name": "amountRefunded",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Reference",
+                "name": "Money",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "https://docs.commercetools.com/release-notes.html#releases-2017-09-29-payment-api-beta-changes"
             },
             {
-              "name": "distributionChannel",
+              "name": "paymentMethodInfo",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Channel",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "PaymentMethodInfo",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "distributionChannelRef",
+              "name": "paymentStatus",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Reference",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "PaymentStatus",
+                  "ofType": null
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discountedPricePerQuantity",
+              "name": "transactions",
               "description": null,
               "args": [],
               "type": {
@@ -34525,7 +42105,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "OBJECT",
-                      "name": "DiscountedLineItemPriceForQuantity",
+                      "name": "Transaction",
                       "ofType": null
                     }
                   }
@@ -34535,31 +42115,36 @@
               "deprecationReason": null
             },
             {
-              "name": "priceMode",
+              "name": "interfaceInteractionsRaw",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "LineItemPriceMode",
-                  "ofType": null
+              "args": [
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "lineItemMode",
-              "description": null,
-              "args": [],
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "LineItemMode",
+                  "kind": "OBJECT",
+                  "name": "InterfaceInteractionsRawResult",
                   "ofType": null
                 }
               },
@@ -34624,36 +42209,100 @@
               "deprecationReason": null
             },
             {
-              "name": "shippingDetails",
-              "description": null,
+              "name": "customFields",
+              "description": "This field would contain type data",
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "ItemShippingDetails",
+                "kind": "INTERFACE",
+                "name": "Type",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "inventoryMode",
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "version",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdBy",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "ItemShippingDetails",
+                "name": "Initiator",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customFields",
-              "description": "Custom fields",
+              "name": "lastModifiedBy",
+              "description": null,
               "args": [],
               "type": {
-                "kind": "INTERFACE",
-                "name": "Type",
+                "kind": "OBJECT",
+                "name": "Initiator",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -34718,104 +42367,64 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "LineItemMode",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "GiftLineItem",
-              "description": "The line item was added automatically, because a discount has added a free gift to the cart.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "Standard",
-              "description": "The line item was added during cart creation or with the update action addLineItem. Its quantity can be changed without restrictions.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "ENUM",
-          "name": "LineItemPriceMode",
-          "description": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "enumValues": [
-            {
-              "name": "Platform",
-              "description": "The price is selected form the product variant. This is the default mode.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "ExternalPrice",
-              "description": "The line item price was set externally. Cart discounts can apply to line items with this price mode. All update actions that change the quantity of a line item with this price mode require the externalPrice field to be given.",
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
+          "interfaces": [
             {
-              "name": "ExternalTotal",
-              "description": "The line item price with the total was set externally.",
-              "isDeprecated": false,
-              "deprecationReason": null
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
             }
           ],
-          "possibleTypes": null
-        },
-        {
-          "kind": "SCALAR",
-          "name": "Locale",
-          "description": "Locale is a scalar value represented as a string language tag.",
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
           "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "LocalizedString",
+          "name": "PaymentInfo",
           "description": null,
           "fields": [
             {
-              "name": "locale",
+              "name": "payments",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Locale",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Payment",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "value",
+              "name": "paymentRefs",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Reference",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
@@ -34827,68 +42436,13 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "INPUT_OBJECT",
-          "name": "LocalizedText",
-          "description": null,
-          "fields": null,
-          "inputFields": [
-            {
-              "name": "text",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
-            },
-            {
-              "name": "locale",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Locale",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null
-            }
-          ],
-          "interfaces": null,
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
-          "name": "Location",
+          "name": "PaymentMethodInfo",
           "description": null,
           "fields": [
             {
-              "name": "country",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Country",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "state",
+              "name": "paymentInterface",
               "description": null,
               "args": [],
               "type": {
@@ -34898,47 +42452,36 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Me",
-          "description": null,
-          "fields": [
+            },
             {
-              "name": "customer",
+              "name": "method",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Customer",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "carts",
+              "name": "name",
               "description": null,
               "args": [
                 {
-                  "name": "where",
-                  "description": null,
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "String",
+                    "name": "Locale",
                     "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "sort",
-                  "description": null,
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -34947,123 +42490,41 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "String",
+                        "name": "Locale",
                         "ofType": null
                       }
                     }
                   },
                   "defaultValue": null
-                },
-                {
-                  "name": "limit",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "offset",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": null
                 }
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "CartQueryResult",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "activeCart",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Cart",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "cart",
-              "description": null,
-              "args": [
-                {
-                  "name": "id",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Cart",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "MessagesConfiguration",
-          "description": null,
-          "fields": [
-            {
-              "name": "enabled",
+              "name": "nameAllLocales",
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
+                "kind": "LIST",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedString",
+                    "ofType": null
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "deleteDaysAfterCreation",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -35073,11 +42534,11 @@
         },
         {
           "kind": "OBJECT",
-          "name": "Money",
+          "name": "PaymentQueryResult",
           "description": null,
           "fields": [
             {
-              "name": "type",
+              "name": "offset",
               "description": null,
               "args": [],
               "type": {
@@ -35085,7 +42546,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -35093,7 +42554,7 @@
               "deprecationReason": null
             },
             {
-              "name": "currencyCode",
+              "name": "count",
               "description": null,
               "args": [],
               "type": {
@@ -35101,7 +42562,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Currency",
+                  "name": "Int",
                   "ofType": null
                 }
               },
@@ -35109,7 +42570,7 @@
               "deprecationReason": null
             },
             {
-              "name": "centAmount",
+              "name": "total",
               "description": null,
               "args": [],
               "type": {
@@ -35125,16 +42586,24 @@
               "deprecationReason": null
             },
             {
-              "name": "fractionDigits",
-              "description": "For the `Money` it equals to the default number of fraction digits used with the currency.",
+              "name": "results",
+              "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Payment",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
@@ -35142,155 +42611,99 @@
             }
           ],
           "inputFields": null,
-          "interfaces": [
-            {
-              "kind": "INTERFACE",
-              "name": "BaseMoney",
-              "ofType": null
-            }
-          ],
+          "interfaces": [],
           "enumValues": null,
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "Parcel",
+          "kind": "ENUM",
+          "name": "PaymentState",
           "description": null,
-          "fields": [
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
             {
-              "name": "id",
+              "name": "Paid",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "createdAt",
+              "name": "CreditOwed",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
-                  "ofType": null
-                }
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "measurements",
+              "name": "Pending",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "ParcelMeasurements",
-                "ofType": null
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "trackingData",
+              "name": "Failed",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "TrackingData",
-                "ofType": null
-              },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "items",
+              "name": "BalanceDue",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "DeliveryItem",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
               "isDeprecated": false,
               "deprecationReason": null
             }
           ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
           "possibleTypes": null
         },
         {
           "kind": "OBJECT",
-          "name": "ParcelMeasurements",
+          "name": "PaymentStatus",
           "description": null,
           "fields": [
             {
-              "name": "heightInMillimeter",
+              "name": "interfaceCode",
               "description": null,
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "lengthInMillimeter",
+              "name": "interfaceText",
               "description": null,
               "args": [],
               "type": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "String",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "widthInMillimeter",
+              "name": "stateRef",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "OBJECT",
+                "name": "Reference",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "weightInGram",
+              "name": "state",
               "description": null,
               "args": [],
               "type": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "OBJECT",
+                "name": "State",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -35302,41 +42715,6 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "OBJECT",
-          "name": "PaymentInfo",
-          "description": null,
-          "fields": [
-            {
-              "name": "paymentRefs",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "Reference",
-                      "ofType": null
-                    }
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
           "name": "Product",
@@ -35454,8 +42832,8 @@
                 "name": "ProductCatalogData",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "only 'masterData' supported"
             },
             {
               "name": "skus",
@@ -35607,13 +42985,9 @@
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "ProductData",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "ProductData",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -35623,13 +42997,9 @@
               "description": null,
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "ProductData",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "ProductData",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -35683,7 +43053,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -35724,7 +43094,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -35809,7 +43179,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -35949,7 +43319,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
@@ -36008,7 +43378,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -36049,7 +43419,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -36090,7 +43460,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -36145,6 +43515,24 @@
               "name": "variants",
               "description": null,
               "args": [
+                {
+                  "name": "skus",
+                  "description": "Queries for products with specified SKUs",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "isOnStock",
                   "description": null,
@@ -36208,6 +43596,24 @@
               "name": "allVariants",
               "description": null,
               "args": [
+                {
+                  "name": "skus",
+                  "description": "Queries for products with specified SKUs",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "isOnStock",
                   "description": null,
@@ -36423,13 +43829,25 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "name",
               "description": null,
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -36470,7 +43888,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -36975,7 +44393,7 @@
             },
             {
               "name": "customFields",
-              "description": "Custom fields",
+              "description": "This field would contain type data",
               "args": [],
               "type": {
                 "kind": "INTERFACE",
@@ -38017,20 +45435,251 @@
               "name": "channel",
               "description": null,
               "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Channel",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "availability",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "Channel",
+                  "name": "ProductVariantAvailability",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "ProductVariantAvailabilityWithChannels",
+          "description": null,
+          "fields": [
+            {
+              "name": "noChannel",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ProductVariantAvailability",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "availability",
+              "name": "channels",
+              "description": null,
+              "args": [
+                {
+                  "name": "includeChannelIds",
+                  "description": "The IDs of channels to include.\n\nIf neither `includeChannelIds` nor `excludeChannelIds` are provided, then all channels are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "excludeChannelIds",
+                  "description": "The IDs of channels to exclude.\n\nIf neither `includeChannelIds` nor `excludeChannelIds` are provided, then all channels are returned.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "ProductVariantAvailabilitiesResult",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "ProjectProjection",
+          "description": "Project contains information about project.",
+          "fields": [
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "languages",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Locale",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "trialUntil",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "YearMonth",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "version",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "externalOAuth",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ExternalOAuth",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "messages",
               "description": null,
               "args": [],
               "type": {
@@ -38038,12 +45687,72 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "ProductVariantAvailability",
+                  "name": "MessagesConfiguration",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "countries",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Country",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "currencies",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "Currency",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shippingRateInputType",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "INTERFACE",
+                "name": "ShippingRateInputType",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -38053,46 +45762,145 @@
         },
         {
           "kind": "OBJECT",
-          "name": "ProductVariantAvailabilityWithChannels",
+          "name": "Query",
           "description": null,
           "fields": [
             {
-              "name": "noChannel",
-              "description": null,
+              "name": "me",
+              "description": "This field can only be used with an access token created with the password flow or with an anonymous session.\n\nIt gives access to the data that is specific to the customer or the anonymous session linked to the access token.",
               "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Me",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "inStore",
+              "description": "This field gives access to the resources (such as carts) that are inside the given store.",
+              "args": [
+                {
+                  "name": "key",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "KeyReferenceInput",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "InStore",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
+            },
+            {
+              "name": "inStores",
+              "description": "This field gives access to the resources (such as carts) that are inside one of the given stores.",
+              "args": [
+                {
+                  "name": "keys",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "LIST",
+                      "name": null,
+                      "ofType": {
+                        "kind": "NON_NULL",
+                        "name": null,
+                        "ofType": {
+                          "kind": "SCALAR",
+                          "name": "KeyReferenceInput",
+                          "ofType": null
+                        }
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "InStore",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
+            },
+            {
+              "name": "customerGroup",
+              "description": null,
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "OBJECT",
-                "name": "ProductVariantAvailability",
+                "name": "CustomerGroup",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "channels",
+              "name": "customerGroups",
               "description": null,
               "args": [
                 {
-                  "name": "includeChannelIds",
-                  "description": "The IDs of channels to include.\n\nIf neither `includeChannelIds` nor `excludeChannelIds` are provided, then all channels are returned.",
+                  "name": "where",
+                  "description": null,
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "excludeChannelIds",
-                  "description": "The IDs of channels to exclude.\n\nIf neither `includeChannelIds` nor `excludeChannelIds` are provided, then all channels are returned.",
+                  "name": "sort",
+                  "description": null,
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -38134,50 +45942,105 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "ProductVariantAvailabilitiesResult",
+                  "name": "CustomerGroupQueryResult",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "ProjectProjection",
-          "description": "Project contains information about project.",
-          "fields": [
+            },
             {
-              "name": "key",
+              "name": "category",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Category",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "name",
+              "name": "categories",
               "description": null,
-              "args": [],
+              "args": [
+                {
+                  "name": "where",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sort",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
+                  "kind": "OBJECT",
+                  "name": "CategoryQueryResult",
                   "ofType": null
                 }
               },
@@ -38185,16 +46048,13 @@
               "deprecationReason": null
             },
             {
-              "name": "languages",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
+              "name": "categoryAutocomplete",
+              "description": "Autocomplete the categories based on category fields like name, description, etc.",
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
                     "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
@@ -38202,22 +46062,78 @@
                       "name": "Locale",
                       "ofType": null
                     }
-                  }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "text",
+                  "description": "Incomplete user input.",
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": "10"
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": "0"
+                },
+                {
+                  "name": "filters",
+                  "description": "Filters to apply during the search and autocomplete - supported fields are:\n* `id`\n* `slug`\n* `externalId`\n* `key`\n* `ancestors`\n* `parent.id`\n* `level`\n* `createdAt`\n* `modifiedAt`\n* `name.{language}:missing`\n* `externalId:missing`\n* `description.{language}:missing`\n* `childCount`\n* `productCount`\n* `productTypeNames`",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "SearchFilter",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "experimental",
+                  "description": "Enables experimental features.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Boolean",
+                    "ofType": null
+                  },
+                  "defaultValue": "false"
                 }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "createdAt",
-              "description": null,
-              "args": [],
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "DateTime",
+                  "kind": "OBJECT",
+                  "name": "CategorySearchResult",
                   "ofType": null
                 }
               },
@@ -38225,27 +46141,110 @@
               "deprecationReason": null
             },
             {
-              "name": "trialUntil",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "SCALAR",
-                "name": "YearMonth",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "version",
-              "description": null,
-              "args": [],
+              "name": "categorySearch",
+              "description": "Search the categories using full-text search, filtering and sorting",
+              "args": [
+                {
+                  "name": "fulltext",
+                  "description": "Full-text search input.",
+                  "type": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "LocalizedText",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": "10"
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": "0"
+                },
+                {
+                  "name": "queryFilters",
+                  "description": "Filters to apply before the results of facets",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "SearchFilter",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "filters",
+                  "description": "Filters to apply during the search and autocomplete - supported fields are:\n* `id`\n* `slug`\n* `externalId`\n* `key`\n* `ancestors`\n* `parent.id`\n* `level`\n* `createdAt`\n* `modifiedAt`\n* `name.{language}:missing`\n* `externalId:missing`\n* `description.{language}:missing`\n* `childCount`\n* `productCount`\n* `productTypeNames`",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "SearchFilter",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sorts",
+                  "description": "Sort result - supported fields are:\n\n* `id`\n* `name`\n* `createdAt`\n* `modifiedAt`\n\nby default sorted by relevance (a score of matches against the search term in descending order)\n",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "SearchSort",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "experimental",
+                  "description": "Enables experimental features.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Boolean",
+                    "ofType": null
+                  },
+                  "defaultValue": "false"
+                }
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Long",
+                  "kind": "OBJECT",
+                  "name": "CategorySearchResult",
                   "ofType": null
                 }
               },
@@ -38253,111 +46252,110 @@
               "deprecationReason": null
             },
             {
-              "name": "messages",
+              "name": "channel",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "MessagesConfiguration",
-                  "ofType": null
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Queries with specified ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Channel",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "countries",
+              "name": "channels",
               "description": null,
-              "args": [],
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
+              "args": [
+                {
+                  "name": "where",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sort",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
                     "name": null,
                     "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Country",
-                      "ofType": null
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
                     }
-                  }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "limit",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "offset",
+                  "description": null,
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
                 }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "currencies",
-              "description": null,
-              "args": [],
+              ],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Currency",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "OBJECT",
+                  "name": "ChannelQueryResult",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "shippingRateInputType",
-              "description": null,
-              "args": [],
-              "type": {
-                "kind": "INTERFACE",
-                "name": "ShippingRateInputType",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Query",
-          "description": null,
-          "fields": [
-            {
-              "name": "me",
-              "description": "This field can only be used with an access token created with the password flow or with an anonymous session.\n\nIt gives access to the data that is specific to the customer or the anonymous session linked to the access token.",
-              "args": [],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Me",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "customerGroup",
+              "name": "productType",
               "description": null,
               "args": [
                 {
                   "name": "id",
-                  "description": "Queries for a customer group with specified ID",
+                  "description": "Queries with specified ID",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -38367,7 +46365,7 @@
                 },
                 {
                   "name": "key",
-                  "description": "Queries for a customer group with specified [customer group key](https://dev.commercetools.com/http-api-projects-customerGroups.html#key)",
+                  "description": "Queries with specified key",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -38378,14 +46376,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "CustomerGroup",
+                "name": "ProductTypeDefinition",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customerGroups",
+              "name": "productTypes",
               "description": null,
               "args": [
                 {
@@ -38442,7 +46440,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "CustomerGroupQueryResult",
+                  "name": "ProductTypeDefinitionQueryResult",
                   "ofType": null
                 }
               },
@@ -38450,12 +46448,12 @@
               "deprecationReason": null
             },
             {
-              "name": "category",
+              "name": "typeDefinition",
               "description": null,
               "args": [
                 {
                   "name": "id",
-                  "description": "Queries for a category with specified ID",
+                  "description": "Queries with specified ID",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -38465,7 +46463,7 @@
                 },
                 {
                   "name": "key",
-                  "description": "Queries for a category with specified [category key](https://dev.commercetools.com/http-api-projects-categories.html#key)",
+                  "description": "Queries with specified key",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -38476,14 +46474,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "Category",
+                "name": "TypeDefinition",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "categories",
+              "name": "typeDefinitions",
               "description": null,
               "args": [
                 {
@@ -38540,7 +46538,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "CategoryQueryResult",
+                  "name": "TypeDefinitionQueryResult",
                   "ofType": null
                 }
               },
@@ -38548,153 +46546,55 @@
               "deprecationReason": null
             },
             {
-              "name": "categoryAutocomplete",
-              "description": "Autocomplete the categories based on category fields like name, description, etc.",
+              "name": "shippingMethod",
+              "description": null,
               "args": [
                 {
-                  "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Locale",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "text",
-                  "description": "Incomplete user input.",
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "limit",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": "10"
-                },
-                {
-                  "name": "offset",
-                  "description": null,
+                  "name": "id",
+                  "description": "Queries with specified ID",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Int",
+                    "name": "String",
                     "ofType": null
                   },
-                  "defaultValue": "0"
-                },
-                {
-                  "name": "filters",
-                  "description": "Filters to apply during the autocomplete - supported fields are:\n* `id`\n* `slug`\n* `externalId`\n* `ancestors`\n* `parent.id`\n* `level`\n* `createdAt`\n* `modifiedAt`\n* `name.{language}:missing`\n* `externalId:missing`\n* `description.{language}:missing`\n* `childCount`\n* `productCount`\n* `productTypeNames`",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "SearchFilter",
-                        "ofType": null
-                      }
-                    }
-                  },
                   "defaultValue": null
                 },
                 {
-                  "name": "experimental",
-                  "description": "Enables experimental features.",
+                  "name": "key",
+                  "description": "Queries with specified key",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Boolean",
+                    "name": "String",
                     "ofType": null
                   },
-                  "defaultValue": "false"
+                  "defaultValue": null
                 }
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "CategorySearchResult",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "ShippingMethod",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "categorySearch",
-              "description": "Search the categories using full-text search, filtering and sorting",
+              "name": "shippingMethods",
+              "description": null,
               "args": [
                 {
-                  "name": "fulltext",
-                  "description": "Full-text search input.",
-                  "type": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "LocalizedText",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "limit",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  },
-                  "defaultValue": "10"
-                },
-                {
-                  "name": "offset",
+                  "name": "where",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Int",
+                    "name": "String",
                     "ofType": null
                   },
-                  "defaultValue": "0"
-                },
-                {
-                  "name": "queryFilters",
-                  "description": "Filters to apply before the results of facets",
-                  "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "SearchFilter",
-                        "ofType": null
-                      }
-                    }
-                  },
                   "defaultValue": null
                 },
                 {
-                  "name": "filters",
-                  "description": "Filters to apply during the autocomplete - supported fields are:\n* `id`\n* `slug`\n* `externalId`\n* `ancestors`\n* `parent.id`\n* `level`\n* `createdAt`\n* `modifiedAt`\n* `name.{language}:missing`\n* `externalId:missing`\n* `description.{language}:missing`\n* `childCount`\n* `productCount`\n* `productTypeNames`",
+                  "name": "sort",
+                  "description": null,
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -38703,7 +46603,7 @@
                       "name": null,
                       "ofType": {
                         "kind": "SCALAR",
-                        "name": "SearchFilter",
+                        "name": "String",
                         "ofType": null
                       }
                     }
@@ -38711,32 +46611,24 @@
                   "defaultValue": null
                 },
                 {
-                  "name": "sorts",
-                  "description": "Sort result - supported fields are:\n\n* `id`\n* `name`\n* `createdAt`\n* `modifiedAt`\n\nby default sorted by relevance (a score of matches against the search term in descending order)\n",
+                  "name": "limit",
+                  "description": null,
                   "type": {
-                    "kind": "LIST",
-                    "name": null,
-                    "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "SearchSort",
-                        "ofType": null
-                      }
-                    }
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "experimental",
-                  "description": "Enables experimental features.",
+                  "name": "offset",
+                  "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Boolean",
+                    "name": "Int",
                     "ofType": null
                   },
-                  "defaultValue": "false"
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -38744,7 +46636,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "CategorySearchResult",
+                  "name": "ShippingMethodQueryResult",
                   "ofType": null
                 }
               },
@@ -38752,7 +46644,7 @@
               "deprecationReason": null
             },
             {
-              "name": "channel",
+              "name": "shippingMethodsByCart",
               "description": null,
               "args": [
                 {
@@ -38771,61 +46663,59 @@
                 }
               ],
               "type": {
-                "kind": "OBJECT",
-                "name": "Channel",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "ShippingMethod",
+                      "ofType": null
+                    }
+                  }
+                }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "channels",
+              "name": "shippingMethodsByLocation",
               "description": null,
               "args": [
                 {
-                  "name": "where",
-                  "description": null,
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "sort",
+                  "name": "country",
                   "description": null,
                   "type": {
-                    "kind": "LIST",
+                    "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
+                      "kind": "SCALAR",
+                      "name": "Country",
+                      "ofType": null
                     }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "limit",
+                  "name": "state",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Int",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "offset",
+                  "name": "currency",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Int",
+                    "name": "Currency",
                     "ofType": null
                   },
                   "defaultValue": null
@@ -38835,16 +46725,24 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "ChannelQueryResult",
-                  "ofType": null
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "ShippingMethod",
+                      "ofType": null
+                    }
+                  }
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "productType",
+              "name": "zone",
               "description": null,
               "args": [
                 {
@@ -38870,14 +46768,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "ProductTypeDefinition",
+                "name": "Zone",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "productTypes",
+              "name": "zones",
               "description": null,
               "args": [
                 {
@@ -38934,7 +46832,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "ProductTypeDefinitionQueryResult",
+                  "name": "ZoneQueryResult",
                   "ofType": null
                 }
               },
@@ -38942,34 +46840,40 @@
               "deprecationReason": null
             },
             {
-              "name": "typeDefinition",
+              "name": "taxCategory",
               "description": null,
               "args": [
                 {
                   "name": "id",
-                  "description": null,
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "TypeDefinition",
+                "name": "TaxCategory",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "typeDefinitions",
+              "name": "taxCategories",
               "description": null,
               "args": [
                 {
@@ -39026,7 +46930,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "TypeDefinitionQueryResult",
+                  "name": "TaxCategoryQueryResult",
                   "ofType": null
                 }
               },
@@ -39034,7 +46938,7 @@
               "deprecationReason": null
             },
             {
-              "name": "shippingMethod",
+              "name": "discountCode",
               "description": null,
               "args": [
                 {
@@ -39054,14 +46958,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "ShippingMethod",
+                "name": "DiscountCode",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "shippingMethods",
+              "name": "discountCodes",
               "description": null,
               "args": [
                 {
@@ -39118,7 +47022,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "ShippingMethodQueryResult",
+                  "name": "DiscountCodeQueryResult",
                   "ofType": null
                 }
               },
@@ -39126,78 +47030,86 @@
               "deprecationReason": null
             },
             {
-              "name": "shippingMethodsByCart",
+              "name": "cartDiscount",
               "description": null,
               "args": [
                 {
                   "name": "id",
-                  "description": null,
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "ShippingMethod",
-                      "ofType": null
-                    }
-                  }
-                }
+                "kind": "OBJECT",
+                "name": "CartDiscount",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "shippingMethodsByLocation",
+              "name": "cartDiscounts",
               "description": null,
               "args": [
                 {
-                  "name": "country",
+                  "name": "where",
                   "description": null,
                   "type": {
-                    "kind": "NON_NULL",
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "sort",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
                     "name": null,
                     "ofType": {
-                      "kind": "SCALAR",
-                      "name": "Country",
-                      "ofType": null
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
                     }
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "state",
+                  "name": "limit",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "String",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "currency",
+                  "name": "offset",
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Currency",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null
@@ -39207,24 +47119,16 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "OBJECT",
-                      "name": "ShippingMethod",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "OBJECT",
+                  "name": "CartDiscountQueryResult",
+                  "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "zone",
+              "name": "productDiscount",
               "description": null,
               "args": [
                 {
@@ -39244,14 +47148,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "Zone",
+                "name": "ProductDiscount",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "zones",
+              "name": "productDiscounts",
               "description": null,
               "args": [
                 {
@@ -39308,7 +47212,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "ZoneQueryResult",
+                  "name": "ProductDiscountQueryResult",
                   "ofType": null
                 }
               },
@@ -39316,34 +47220,60 @@
               "deprecationReason": null
             },
             {
-              "name": "taxCategory",
+              "name": "product",
               "description": null,
               "args": [
+                {
+                  "name": "sku",
+                  "description": "Queries for a product with specified SKU",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "variantKey",
+                  "description": "Queries for a product with specified [product variant key](https://dev.commercetools.com/http-api-projects-products.html#variant_key)",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "id",
-                  "description": null,
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "TaxCategory",
+                "name": "Product",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "taxCategories",
+              "name": "products",
               "description": null,
               "args": [
                 {
@@ -39393,6 +47323,24 @@
                     "ofType": null
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "skus",
+                  "description": "Queries for products with specified SKUs",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -39400,7 +47348,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "TaxCategoryQueryResult",
+                  "name": "ProductQueryResult",
                   "ofType": null
                 }
               },
@@ -39408,34 +47356,40 @@
               "deprecationReason": null
             },
             {
-              "name": "discountCode",
+              "name": "state",
               "description": null,
               "args": [
                 {
                   "name": "id",
-                  "description": null,
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "DiscountCode",
+                "name": "State",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "discountCodes",
+              "name": "states",
               "description": null,
               "args": [
                 {
@@ -39492,7 +47446,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "DiscountCodeQueryResult",
+                  "name": "StateQueryResult",
                   "ofType": null
                 }
               },
@@ -39500,34 +47454,60 @@
               "deprecationReason": null
             },
             {
-              "name": "cartDiscount",
+              "name": "customer",
               "description": null,
               "args": [
+                {
+                  "name": "emailToken",
+                  "description": "Queries a customer with specified email token",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "passwordToken",
+                  "description": "Queries a customer with specified password token",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "id",
-                  "description": null,
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "CartDiscount",
+                "name": "Customer",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "cartDiscounts",
+              "name": "customers",
               "description": null,
               "args": [
                 {
@@ -39584,7 +47564,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "CartDiscountQueryResult",
+                  "name": "CustomerQueryResult",
                   "ofType": null
                 }
               },
@@ -39592,7 +47572,7 @@
               "deprecationReason": null
             },
             {
-              "name": "productDiscount",
+              "name": "inventoryEntry",
               "description": null,
               "args": [
                 {
@@ -39612,14 +47592,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "ProductDiscount",
+                "name": "InventoryEntry",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "productDiscounts",
+              "name": "inventoryEntries",
               "description": null,
               "args": [
                 {
@@ -39674,70 +47654,44 @@
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "ProductDiscountQueryResult",
-                  "ofType": null
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "product",
-              "description": null,
-              "args": [
-                {
-                  "name": "id",
-                  "description": "Queries for a product with specified ID",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "key",
-                  "description": "Queries for a product with specified [product key](https://dev.commercetools.com/http-api-projects-products.html#key)",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "sku",
-                  "description": "Queries for a product with specified SKU",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "InventoryEntryQueryResult",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "cart",
+              "description": null,
+              "args": [
                 {
-                  "name": "variantKey",
-                  "description": "Queries for a product with specified [product variant key](https://dev.commercetools.com/http-api-projects-products.html#variant_key)",
+                  "name": "id",
+                  "description": null,
                   "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "Product",
+                "name": "Cart",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "products",
+              "name": "carts",
               "description": null,
               "args": [
                 {
@@ -39787,40 +47741,49 @@
                     "ofType": null
                   },
                   "defaultValue": null
-                },
+                }
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "CartQueryResult",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "customerActiveCart",
+              "description": null,
+              "args": [
                 {
-                  "name": "skus",
-                  "description": "Queries for products with specified SKUs",
+                  "name": "customerId",
+                  "description": null,
                   "type": {
-                    "kind": "LIST",
+                    "kind": "NON_NULL",
                     "name": null,
                     "ofType": {
-                      "kind": "NON_NULL",
-                      "name": null,
-                      "ofType": {
-                        "kind": "SCALAR",
-                        "name": "String",
-                        "ofType": null
-                      }
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
                     }
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "ProductQueryResult",
-                  "ofType": null
-                }
+                "kind": "OBJECT",
+                "name": "Cart",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "state",
+              "name": "order",
               "description": null,
               "args": [
                 {
@@ -39834,8 +47797,8 @@
                   "defaultValue": null
                 },
                 {
-                  "name": "key",
-                  "description": "Queries with specified key",
+                  "name": "orderNumber",
+                  "description": null,
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -39846,14 +47809,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "State",
+                "name": "Order",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "states",
+              "name": "orders",
               "description": null,
               "args": [
                 {
@@ -39910,7 +47873,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "StateQueryResult",
+                  "name": "OrderQueryResult",
                   "ofType": null
                 }
               },
@@ -39918,12 +47881,12 @@
               "deprecationReason": null
             },
             {
-              "name": "customer",
+              "name": "payment",
               "description": null,
               "args": [
                 {
                   "name": "id",
-                  "description": "Queries a customer with specified ID",
+                  "description": "Queries with specified ID",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -39933,27 +47896,7 @@
                 },
                 {
                   "name": "key",
-                  "description": "Queries a customer with specified key",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "emailToken",
-                  "description": "Queries a customer with specified email token",
-                  "type": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  },
-                  "defaultValue": null
-                },
-                {
-                  "name": "passwordToken",
-                  "description": "Queries a customer with specified password token",
+                  "description": "Queries with specified key",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -39964,14 +47907,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "Customer",
+                "name": "Payment",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "customers",
+              "name": "payments",
               "description": null,
               "args": [
                 {
@@ -40028,7 +47971,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "CustomerQueryResult",
+                  "name": "PaymentQueryResult",
                   "ofType": null
                 }
               },
@@ -40036,34 +47979,56 @@
               "deprecationReason": null
             },
             {
-              "name": "inventoryEntry",
+              "name": "project",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "ProjectProjection",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "store",
               "description": null,
               "args": [
                 {
                   "name": "id",
-                  "description": null,
+                  "description": "Queries with specified ID",
                   "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "key",
+                  "description": "Queries with specified key",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
                   },
                   "defaultValue": null
                 }
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "InventoryEntry",
+                "name": "Store",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
             },
             {
-              "name": "inventoryEntries",
+              "name": "stores",
               "description": null,
               "args": [
                 {
@@ -40120,15 +48085,15 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "InventoryEntryQueryResult",
+                  "name": "StoreQueryResult",
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "beta feature"
             },
             {
-              "name": "cart",
+              "name": "apiClient",
               "description": null,
               "args": [
                 {
@@ -40148,41 +48113,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "Cart",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "customerActiveCart",
-              "description": null,
-              "args": [
-                {
-                  "name": "customerId",
-                  "description": null,
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  },
-                  "defaultValue": null
-                }
-              ],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Cart",
+                "name": "APIClientWithoutSecret",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "carts",
+              "name": "apiClients",
               "description": null,
               "args": [
                 {
@@ -40239,7 +48177,55 @@
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "CartQueryResult",
+                  "name": "APIClientWithoutSecretQueryResult",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "CartQueryInterface",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "CustomerActiveCartInterface",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "OrderQueryInterface",
+              "ofType": null
+            },
+            {
+              "kind": "INTERFACE",
+              "name": "MeFieldInterface",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "RawCustomField",
+          "description": null,
+          "fields": [
+            {
+              "name": "name",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
@@ -40247,15 +48233,15 @@
               "deprecationReason": null
             },
             {
-              "name": "project",
+              "name": "value",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "ProjectProjection",
+                  "kind": "SCALAR",
+                  "name": "Json",
                   "ofType": null
                 }
               },
@@ -40270,7 +48256,7 @@
         },
         {
           "kind": "OBJECT",
-          "name": "RawCustomField",
+          "name": "RawProductAttribute",
           "description": null,
           "fields": [
             {
@@ -40304,6 +48290,18 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "attributeDefinition",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "AttributeDefinition",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -40313,11 +48311,11 @@
         },
         {
           "kind": "OBJECT",
-          "name": "RawProductAttribute",
+          "name": "Reference",
           "description": null,
           "fields": [
             {
-              "name": "name",
+              "name": "typeId",
               "description": null,
               "args": [],
               "type": {
@@ -40333,7 +48331,7 @@
               "deprecationReason": null
             },
             {
-              "name": "value",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
@@ -40341,20 +48339,67 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "Json",
+                  "name": "String",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "ReturnInfo",
+          "description": "Stores information about returns connected to this order.",
+          "fields": [
+            {
+              "name": "items",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INTERFACE",
+                      "name": "ReturnItem",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
-              "name": "attributeDefinition",
+              "name": "returnTrackingId",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "AttributeDefinition",
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "returnDate",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -40367,12 +48412,12 @@
           "possibleTypes": null
         },
         {
-          "kind": "OBJECT",
-          "name": "Reference",
+          "kind": "INTERFACE",
+          "name": "ReturnItem",
           "description": null,
           "fields": [
             {
-              "name": "typeId",
+              "name": "type",
               "description": null,
               "args": [],
               "type": {
@@ -40402,11 +48447,184 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "quantity",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "comment",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "shipmentState",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnShipmentState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "paymentState",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "ReturnPaymentState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
-          "interfaces": [],
+          "interfaces": null,
           "enumValues": null,
+          "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "CustomLineItemReturnItem",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "LineItemReturnItem",
+              "ofType": null
+            }
+          ]
+        },
+        {
+          "kind": "ENUM",
+          "name": "ReturnPaymentState",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "NotRefunded",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Refunded",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Initial",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "NonRefundable",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "ReturnShipmentState",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "Unusable",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "BackInStock",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Returned",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Advised",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
           "possibleTypes": null
         },
         {
@@ -40536,6 +48754,53 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "ENUM",
+          "name": "ShipmentState",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "Delayed",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Backorder",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Partial",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Pending",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Ready",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Shipped",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "ShippingInfo",
@@ -41351,7 +49616,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -41412,7 +49677,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -41754,6 +50019,271 @@
           ],
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "Store",
+          "description": "[BETA] Stores allow defining different contexts for a project.",
+          "fields": [
+            {
+              "name": "id",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "version",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "name",
+              "description": null,
+              "args": [
+                {
+                  "name": "locale",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Locale",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "acceptLanguage",
+                  "description": "List of languages the client is able to understand, and which locale variant is preferred.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "Locale",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "nameAllLocales",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "LocalizedString",
+                    "ofType": null
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "createdBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "lastModifiedBy",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Initiator",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+            {
+              "kind": "INTERFACE",
+              "name": "Versioned",
+              "ofType": null
+            }
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "StoreQueryResult",
+          "description": null,
+          "fields": [
+            {
+              "name": "offset",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "count",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "total",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Long",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "results",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "OBJECT",
+                      "name": "Store",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "SubRate",
@@ -41797,6 +50327,73 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "SyncInfo",
+          "description": "Stores information about order synchronization activities (like export or import).",
+          "fields": [
+            {
+              "name": "channelRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Reference",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "channel",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Channel",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "externalId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "syncedAt",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "DateTime",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "ENUM",
           "name": "TaxCalculationMode",
@@ -42398,19 +50995,19 @@
         {
           "kind": "ENUM",
           "name": "TextInputHint",
-          "description": null,
+          "description": "UI hint telling what kind of edit control should be displayed for a text attribute.",
           "fields": null,
           "inputFields": null,
           "interfaces": null,
           "enumValues": [
             {
-              "name": "SingleLine",
+              "name": "MultiLine",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "MultiLine",
+              "name": "SingleLine",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
@@ -42494,41 +51091,208 @@
           "possibleTypes": null
         },
         {
-          "kind": "INTERFACE",
-          "name": "Type",
+          "kind": "OBJECT",
+          "name": "Transaction",
           "description": null,
           "fields": [
             {
-              "name": "typeRef",
+              "name": "id",
               "description": null,
               "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "OBJECT",
-                  "name": "Reference",
+                  "kind": "SCALAR",
+                  "name": "String",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "timestamp",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "type",
               "description": null,
               "args": [],
+              "type": {
+                "kind": "ENUM",
+                "name": "TransactionType",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "amount",
+              "description": null,
+              "args": [],
               "type": {
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
                   "kind": "OBJECT",
-                  "name": "TypeDefinition",
+                  "name": "Money",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "interactionId",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "state",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "TransactionState",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "TransactionState",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "Failure",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Success",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Pending",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Initial",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "ENUM",
+          "name": "TransactionType",
+          "description": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "Chargeback",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Refund",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Charge",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "CancelAuthorization",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "Authorization",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
+        {
+          "kind": "INTERFACE",
+          "name": "Type",
+          "description": null,
+          "fields": [
+            {
+              "name": "typeRef",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "Reference",
                   "ofType": null
                 }
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "type",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "TypeDefinition",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
@@ -42569,7 +51333,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -42610,7 +51374,7 @@
               "args": [
                 {
                   "name": "locale",
-                  "description": "String is define for different locales. This argument specifies the desired locale.",
+                  "description": "String is defined for different locales. This argument specifies the desired locale.",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Locale",
@@ -43055,6 +51819,11 @@
           "interfaces": null,
           "enumValues": null,
           "possibleTypes": [
+            {
+              "kind": "OBJECT",
+              "name": "Cart",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "CartDiscount",
@@ -43090,6 +51859,16 @@
               "name": "InventoryEntry",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Order",
+              "ofType": null
+            },
+            {
+              "kind": "OBJECT",
+              "name": "Payment",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "Product",
@@ -43115,6 +51894,11 @@
               "name": "State",
               "ofType": null
             },
+            {
+              "kind": "OBJECT",
+              "name": "Store",
+              "ofType": null
+            },
             {
               "kind": "OBJECT",
               "name": "TaxCategory",
@@ -43195,6 +51979,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "key",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "description",
               "description": null,
diff --git a/package.json b/package.json
index 90d09b8a..08d30b89 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
     "vue-product-zoomer": "^2.0.11",
     "vue-router": "^3.0.1",
     "vuelidate": "^0.7.4",
-    "vuex": "^3.0.1"
+    "vuex": "^3.0.1",
+    "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
     "@cypress/webpack-preprocessor": "^4.0.2",
diff --git a/src/components/cartdetail/LineItemDeleteForm.vue b/src/components/cartdetail/LineItemDeleteForm.vue
index 95c4e379..79276a37 100644
--- a/src/components/cartdetail/LineItemDeleteForm.vue
+++ b/src/components/cartdetail/LineItemDeleteForm.vue
@@ -1,5 +1,6 @@
 <template>
-  <button @click="removeLineItem"
+  <button v-if="cartExists"
+          @click="removeLineItem"
           data-test="cart-line-item-delete"
           class="edit-delete-section">
     <img src="../../assets/img/delete-1.png"
diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
index b2fec3d8..45451685 100644
--- a/src/components/cartdetail/LineItemQuantityForm.vue
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="quantity-spinner">
+  <div v-if="cartExists"
+       class="quantity-spinner">
     <span @click="form.quantity -= 1"
           data-test="cart-line-item-quantity-dec"
           class="change-quantity-button input-number-decrement">–</span>
@@ -17,7 +18,7 @@
 <script>
 import debounce from 'lodash.debounce';
 import { required, minValue, numeric } from 'vuelidate/lib/validators';
-import BaseInput from '../common/BaseInput.vue';
+import BaseInput from '../common/form/BaseInput.vue';
 import cartMixin from '../../mixins/cartMixin';
 import formMixin from '../../mixins/formMixin';
 
diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index fd6c1f4a..09daa505 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -98,9 +98,9 @@
 <script>
 import gql from 'graphql-tag';
 import { required, email } from 'vuelidate/lib/validators';
-import BaseInput from '../common/BaseInput.vue';
-import BaseSelect from '../common/BaseSelect.vue';
-import LoadingButton from '../common/LoadingButton.vue';
+import BaseInput from '../common/form/BaseInput.vue';
+import BaseSelect from '../common/form/BaseSelect.vue';
+import LoadingButton from '../common/form/LoadingButton.vue';
 
 export default {
   components: {
diff --git a/src/components/common/CartLikePriceDetail.vue b/src/components/common/CartLikePriceDetail.vue
index 49812dd5..4f191bad 100644
--- a/src/components/common/CartLikePriceDetail.vue
+++ b/src/components/common/CartLikePriceDetail.vue
@@ -45,13 +45,15 @@
           <!--<span class="order-discount">{{ cart.discount }}</span>-->
         </div>
         <div>
-          <span v-if="cartLike.shippingInfo">
+          <span v-if="cartLike.shippingInfo"
+                data-test="cart-shipping-price">
             <BaseMoney :money="cartLike.shippingInfo.price"/>
           </span>
         </div>
         <hr>
         <div>
-          <span v-if="taxes">
+          <span v-if="taxes"
+                data-test="cart-taxes-amount">>
             <BaseMoney :money="taxes"/>
           </span>
         </div>
diff --git a/src/components/common/BaseInput.vue b/src/components/common/form/BaseInput.vue
similarity index 96%
rename from src/components/common/BaseInput.vue
rename to src/components/common/form/BaseInput.vue
index 88e2c996..cec821a3 100644
--- a/src/components/common/BaseInput.vue
+++ b/src/components/common/form/BaseInput.vue
@@ -18,7 +18,7 @@
 
 <script>
 import ValidationError from './ValidationError.vue';
-import BaseLabel from './BaseLabel.vue';
+import BaseLabel from '../BaseLabel.vue';
 
 export default {
   inheritAttrs: false,
diff --git a/src/components/common/BaseSelect.vue b/src/components/common/form/BaseSelect.vue
similarity index 92%
rename from src/components/common/BaseSelect.vue
rename to src/components/common/form/BaseSelect.vue
index a9ea9fa8..e2945826 100644
--- a/src/components/common/BaseSelect.vue
+++ b/src/components/common/form/BaseSelect.vue
@@ -14,8 +14,8 @@
 
 <script>
 import ValidationError from './ValidationError.vue';
-import SelectBoxIt from './SelectBoxIt.vue';
-import BaseLabel from './BaseLabel.vue';
+import SelectBoxIt from '../SelectBoxIt.vue';
+import BaseLabel from '../BaseLabel.vue';
 
 export default {
   inheritAttrs: false,
diff --git a/src/components/common/LoadingButton.vue b/src/components/common/form/LoadingButton.vue
similarity index 97%
rename from src/components/common/LoadingButton.vue
rename to src/components/common/form/LoadingButton.vue
index 74df9629..a0f40dd9 100644
--- a/src/components/common/LoadingButton.vue
+++ b/src/components/common/form/LoadingButton.vue
@@ -7,7 +7,7 @@
       <span v-if="state === 'loading'"
             key="loading"
             class="state-layer">
-        <img src="../../assets/img/loading.svg"
+        <img src="../../../assets/img/loading.svg"
              class="loading-animation"/>
       </span>
     </transition>
diff --git a/src/components/common/ServerError.vue b/src/components/common/form/ServerError.vue
similarity index 100%
rename from src/components/common/ServerError.vue
rename to src/components/common/form/ServerError.vue
diff --git a/src/components/common/ValidationError.vue b/src/components/common/form/ValidationError.vue
similarity index 100%
rename from src/components/common/ValidationError.vue
rename to src/components/common/form/ValidationError.vue
diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue
index 4320acc2..15388453 100644
--- a/src/components/header/MiniCart.vue
+++ b/src/components/header/MiniCart.vue
@@ -24,13 +24,13 @@
                 <div class="details">
                   <p class="product-quantity">
                     {{ $t('quantity') }}
-                    <span data-test="mini-cart-line-item-quantity">
+                    <span data-test="cart-line-item-quantity">
                       {{ lineItem.quantity }}
                     </span>
                   </p>
                   <p class="product-price">
                     {{ $t('price') }}
-                    <span data-test="mini-cart-line-item-price">
+                    <span data-test="cart-line-item-price">
                       <BaseMoney :money="lineItem.totalPrice"/>
                     </span>
                   </p>
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index 1d60a5a3..ad49a4f7 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -60,9 +60,9 @@ import { required, email } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
 import { clientLogin } from '../../auth';
 import formMixin from '../../mixins/formMixin';
-import ServerError from '../common/ServerError.vue';
-import LoadingButton from '../common/LoadingButton.vue';
-import BaseInput from '../common/BaseInput.vue';
+import ServerError from '../common/form/ServerError.vue';
+import LoadingButton from '../common/form/LoadingButton.vue';
+import BaseInput from '../common/form/BaseInput.vue';
 
 export default {
   components: {
diff --git a/src/components/login/SignUpForm.vue b/src/components/login/SignUpForm.vue
index 074173aa..e0d83f22 100644
--- a/src/components/login/SignUpForm.vue
+++ b/src/components/login/SignUpForm.vue
@@ -97,9 +97,9 @@ import {
 import gql from 'graphql-tag';
 import { clientLogin } from '../../auth';
 import formMixin from '../../mixins/formMixin';
-import ServerError from '../common/ServerError.vue';
-import LoadingButton from '../common/LoadingButton.vue';
-import BaseInput from '../common/BaseInput.vue';
+import ServerError from '../common/form/ServerError.vue';
+import LoadingButton from '../common/form/LoadingButton.vue';
+import BaseInput from '../common/form/BaseInput.vue';
 
 export default {
   components: {
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index a7fb0301..5dc50d53 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -41,9 +41,9 @@ import { required, numeric, between } from 'vuelidate/lib/validators';
 import cartMixin from '../../mixins/cartMixin';
 import priceMixin from '../../mixins/priceMixin';
 import formMixin from '../../mixins/formMixin';
-import ServerError from '../common/ServerError.vue';
-import LoadingButton from '../common/LoadingButton.vue';
-import BaseSelect from '../common/BaseSelect.vue';
+import ServerError from '../common/form/ServerError.vue';
+import LoadingButton from '../common/form/LoadingButton.vue';
+import BaseSelect from '../common/form/BaseSelect.vue';
 
 const MAX_QUANTITY = 10;
 
diff --git a/src/components/productoverview/ProductList.vue b/src/components/productoverview/ProductList.vue
index 02ef89f7..d748310f 100644
--- a/src/components/productoverview/ProductList.vue
+++ b/src/components/productoverview/ProductList.vue
@@ -1,39 +1,39 @@
 <template>
   <div>
     <form id="form-filter-products" name="filter-products" action="#">
-<!--        {{#if content.searchTerm}}
-            <input type="hidden" name="q" value="{{content.searchTerm}}"/>
-            {{/if}}-->
+<!--  {{#if content.searchTerm}}
+        <input type="hidden" name="q" value="{{content.searchTerm}}"/>
+      {{/if}}-->
 
-            <div class="row item-list-pagination">
-<!--              {{#if content.searchResult}}
-              <div class="search-results-row">
-                {{> catalog/pop/search-result searchResult=content.searchResult}}
-              </div>
-              {{else}}
-              <div class="jumbotron-row">
-                {{> catalog/pop/jumbotron jumbotron=content.jumbotron}}
-              </div>
-              {{/if}}-->
-              <div class="col-xs-4 hidden-xs text-left">
-                <div class="custom-select-wrapper">
-                  <ProductSortSelector @changeSort="changeSort" />
-                  <!--{{> catalog/pop/sort-selector sortSelector=content.sortSelector}}-->
-                </div>
-              </div>
-              <div class="col-xs-4 hidden-xs text-center custom-pagination">
-                <ul class="page-numbers">
-                  <!--{{> common/pagination pagination=content.pagination}}-->
-                </ul>
-              </div>
-              <div class="col-xs-4 hidden-xs text-right">
-                <!--{{> catalog/pop/display-selector displaySelector=content.displaySelector}}-->
-              </div>
-            </div>
-            <div class="product-filter hidden-xs">
-              <!--{{> catalog/pop/filters-sidebar}}-->
-            </div>
-          </form>
+      <div class="row item-list-pagination">
+<!--    {{#if content.searchResult}}
+        <div class="search-results-row">
+          {{> catalog/pop/search-result searchResult=content.searchResult}}
+        </div>
+        {{else}}
+        <div class="jumbotron-row">
+          {{> catalog/pop/jumbotron jumbotron=content.jumbotron}}
+        </div>
+        {{/if}}-->
+        <div class="col-xs-4 hidden-xs text-left">
+          <div class="custom-select-wrapper">
+            <ProductSortSelector @changeSort="changeSort" />
+            <!--{{> catalog/pop/sort-selector sortSelector=content.sortSelector}}-->
+          </div>
+        </div>
+        <div class="col-xs-4 hidden-xs text-center custom-pagination">
+          <ul class="page-numbers">
+            <!--{{> common/pagination pagination=content.pagination}}-->
+          </ul>
+        </div>
+        <div class="col-xs-4 hidden-xs text-right">
+          <!--{{> catalog/pop/display-selector displaySelector=content.displaySelector}}-->
+        </div>
+      </div>
+      <div class="product-filter hidden-xs">
+        <!--{{> catalog/pop/filters-sidebar}}-->
+      </div>
+    </form>
     <div v-if="isLoading">
       <img data-test="spinner" src="../../assets/img/spinner.gif"/>
     </div>
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index 512171fc..c728396e 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -105,9 +105,9 @@ import { required, email } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
 import formMixin from '../../../mixins/formMixin';
 import customerMixin from '../../../mixins/customerMixin';
-import ServerError from '../../common/ServerError.vue';
-import LoadingButton from '../../common/LoadingButton.vue';
-import BaseInput from '../../common/BaseInput.vue';
+import ServerError from '../../common/form/ServerError.vue';
+import LoadingButton from '../../common/form/LoadingButton.vue';
+import BaseInput from '../../common/form/BaseInput.vue';
 
 export default {
   components: {
diff --git a/src/main.js b/src/main.js
index 17fc9671..012dae3d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,7 @@
 import Vue from 'vue';
+// Required until Cypress supports fetch API
+// https://github.com/cypress-io/cypress/issues/95
+import 'whatwg-fetch';
 import App from '@/App.vue';
 import Vuelidate from 'vuelidate';
 import router from '@/router';
diff --git a/tests/e2e/specs/cartDetailPage_spec.js b/tests/e2e/specs/cartDetailPage_spec.js
index 9ed8bf47..d7aad0a2 100644
--- a/tests/e2e/specs/cartDetailPage_spec.js
+++ b/tests/e2e/specs/cartDetailPage_spec.js
@@ -55,30 +55,42 @@ describe('CartDetailPage', () => {
     cy.addLineItem('/product/lemare-booties-0778-grey/M0E20000000E0WX', 3);
     cy.visit('/cart');
 
-    cy.get('[data-test=cart-line-item-quantity]')
-      .should('have.value', '3')
-      .clear()
-      .type('5');
-    cy.get('[data-test=cart-line-item-total-price]')
-      .contains(/^\s*870,60\s€\s*$/);
-
-    cy.get('[data-test=cart-line-item-quantity-inc]')
-      .click()
-      .click();
-    cy.get('[data-test=cart-line-item-quantity]')
-      .should('have.value', '7');
-    cy.get('[data-test=cart-line-item-total-price]')
-      .contains(/^\s*1.218,84\s€\s*$/);
+    cy.get('[data-test=cart-line-item]')
+      .should('have.length', 1)
+      .then(($lineItem) => {
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-quantity]')
+          .should('have.value', '3')
+          .clear()
+          .type('5');
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-total-price]')
+          .contains(/^\s*870,60\s€\s*$/);
 
-    cy.get('[data-test=cart-line-item-quantity-dec]')
-      .click();
-    cy.get('[data-test=cart-line-item-quantity]')
-      .should('have.value', '6');
-    cy.get('[data-test=cart-line-item-total-price]')
-      .contains(/^\s*1.044,72\s€\s*$/);
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-quantity-inc]')
+          .click()
+          .click();
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-quantity]')
+          .should('have.value', '7');
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-total-price]')
+          .contains(/^\s*1.218,84\s€\s*$/);
 
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-quantity-dec]')
+          .click();
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-quantity]')
+          .should('have.value', '6');
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-total-price]')
+          .contains(/^\s*1.044,72\s€\s*$/);
 
-    cy.get('[data-test=cart-line-item-delete]').click();
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-delete]').click();
+      });
     cy.get('[data-test=cart-line-item]').should('have.length', 0);
   });
 });
diff --git a/tests/e2e/specs/miniCart_spec.js b/tests/e2e/specs/miniCart_spec.js
index 9adca7ce..c42447fb 100644
--- a/tests/e2e/specs/miniCart_spec.js
+++ b/tests/e2e/specs/miniCart_spec.js
@@ -25,20 +25,20 @@ describe('MiniCart', () => {
       .eq(0)
       .then(($lineItem) => {
         cy.wrap($lineItem)
-          .find('[data-test=mini-cart-line-item-link]')
+          .find('[data-test=cart-line-item-link]')
           .should('have.attr', 'href', '/product/lemare-booties-0778-grey/M0E20000000E0WX')
           .should('contain', 'Booties Lemare grey');
 
         cy.wrap($lineItem)
-          .find('[data-test=mini-cart-line-item-quantity]')
+          .find('[data-test=cart-line-item-quantity]')
           .should('contain', '3');
 
         cy.wrap($lineItem)
-          .find('[data-test=mini-cart-line-item-price]')
+          .find('[data-test=cart-line-item-price]')
           .contains(/^\s*522,36\s€\s*$/);
       });
 
-    cy.get('[data-test=mini-cart-line-item-delete]')
+    cy.get('[data-test=cart-line-item-delete]')
       .eq(1)
       .click();
     cy.get('[data-test=mini-cart-open-button]')
diff --git a/tests/e2e/specs/orderDetail_spec.js b/tests/e2e/specs/orderDetail_spec.js
index 6e4edcd6..e31b7a22 100644
--- a/tests/e2e/specs/orderDetail_spec.js
+++ b/tests/e2e/specs/orderDetail_spec.js
@@ -1,5 +1,5 @@
 describe('OrderDetailPage', () => {
-  const customer = {
+  const customerDraft = {
     firstName: 'Charlie',
     lastName: 'Bucket',
     email: 'charlie.bucket+ci@commercetools.com',
@@ -43,7 +43,7 @@ describe('OrderDetailPage', () => {
       email: 'charlie.bucket+ci@commercetools.com',
     },
     shippingMethod: {
-      id: 'fe39f916-d4d7-4f99-9554-5949efeb2a0c',
+      key: 'express-EU',
     },
     lineItems: [{
       sku: 'M0E20000000EFWN',
@@ -56,8 +56,8 @@ describe('OrderDetailPage', () => {
   };
 
   before(() => {
-    cy.login(customer);
-    cy.createMyOrder(cartDraft, orderDraft);
+    cy.login(customerDraft);
+    cy.createOrder(cartDraft, orderDraft);
   });
 
   it('shows order details', () => {
@@ -71,9 +71,13 @@ describe('OrderDetailPage', () => {
       .contains(/^\s*\d{1,2}\.*\s*[A-Za-zäÄöÖüÜß]+\s*\d{4}\s*$/);
     cy.get('[data-test=cart-subtotal-price]')
       .contains(/^\s*367,60\s€\s*$/);
+    cy.get('[data-test=cart-shipping-price]')
+      .contains(/^\s*10,00\s€\s*$/);
+    cy.get('[data-test=cart-taxes-amount]')
+      .contains(/^\s*60,29\s€\s*$/);
     cy.get('[data-test=cart-total-price]')
-      .contains(/^\s*367,60\s€\s*$/);
-    cy.get('[data-test=order-line-items]')
+      .contains(/^\s*377,60\s€\s*$/);
+    cy.get('[data-test=cart-line-item]')
       .should('have.length', 2)
       .eq(1)
       .then(($item) => {
diff --git a/tests/e2e/specs/orderList_spec.js b/tests/e2e/specs/orderList_spec.js
index 9e54f9d4..46e8daf2 100644
--- a/tests/e2e/specs/orderList_spec.js
+++ b/tests/e2e/specs/orderList_spec.js
@@ -44,8 +44,8 @@ describe('my orders', () => {
   });
 
   it('shows my orders', () => {
-    cy.createMyOrder(cartDraft1, orderDraft1);
-    cy.createMyOrder(cartDraft2, orderDraft2);
+    cy.createOrder(cartDraft1, orderDraft1);
+    cy.createOrder(cartDraft2, orderDraft2);
     cy.get('[data-test=my-orders-button]').click();
     cy.get('[data-test=order-list]')
       .should('have.length', 2)
diff --git a/tests/e2e/specs/pageProductOverview_spec.js b/tests/e2e/specs/pageProductOverview_spec.js
index c3445444..22115f94 100644
--- a/tests/e2e/specs/pageProductOverview_spec.js
+++ b/tests/e2e/specs/pageProductOverview_spec.js
@@ -2,6 +2,7 @@ describe('Product overview page', () => {
   before(() => {
     cy.visit('/products/men');
   });
+
   it('Changes sorting settings', () => {
     cy.get('span[data-test=sort-selector]')
       .click()
@@ -41,6 +42,7 @@ describe('Product overview page', () => {
       .find('[data-test=product-thumbnail-name]')
       .contains('Shirt ”David” MU light blue');
   });
+
   it('Applies sorting settings from URL', () => {
     cy.visit('/products/men?sort=newest');
     cy.get('[data-test=product-list]', { timeout: 20000 })
diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
index 8f8b940e..05868527 100644
--- a/tests/e2e/support/commands.js
+++ b/tests/e2e/support/commands.js
@@ -24,8 +24,9 @@
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
 
-import gql from 'graphql-tag';
 import createClient from './test-apollo';
+import * as query from './queries';
+import * as mutation from './mutations';
 
 const clientPromise = createClient();
 
@@ -37,55 +38,12 @@ Cypress.Commands.add('login', customer => cy.createCustomer(customer).then(() =>
   cy.get('[data-test=login-form-submit]').click();
 }));
 
-Cypress.Commands.add('createCustomer', (draft) => {
-  const createCustomer = client => client.mutate({
-    mutation: gql`
-        mutation createNewCustomer($draft: CustomerSignMeUpDraft!) {
-          customerSignMeUp(draft: $draft) {
-            customer {
-              id
-            }
-          }
-        }`,
-    variables: { draft },
-  });
+Cypress.Commands.add('createCustomer', draft => cy.wrap(clientPromise
+  .then(client => mutation.deleteCustomer(client, draft.email)
+    .then(() => mutation.createCustomer(client, draft)))));
 
-  return cy.deleteCustomer(draft).then(() => cy.wrap(clientPromise.then(client => createCustomer(client))));
-});
-
-Cypress.Commands.add('deleteCustomer', ({ email }) => {
-  const deleteCustomer = client => client.query({
-    query: gql`
-      query queryCustomerByEmail($predicate: String) {
-        customers(limit: 1, where: $predicate) {
-          results {
-            id
-            version
-          }
-        }
-      }`,
-    variables: { predicate: `email = "${email}"` },
-    fetchPolicy: 'network-only',
-  }).then(async (response) => {
-    const customer = response.data.customers.results[0];
-    if (customer) {
-      await client.mutate({
-        mutation: gql`
-            mutation deleteOldCustomer($id: String!, $version: Long!) {
-              deleteCustomer(id: $id, version: $version, personalDataErasure: true) {
-                id
-              }
-            }`,
-        variables: {
-          id: customer.id,
-          version: customer.version,
-        },
-      }).catch(e => console.warn('Customer might have been already deleted', e));
-    }
-  });
-
-  return cy.wrap(clientPromise.then(client => deleteCustomer(client)));
-});
+Cypress.Commands.add('deleteCustomer', ({ email }) => cy.wrap(clientPromise
+  .then(client => mutation.deleteCustomer(client, email))));
 
 Cypress.Commands.add('addLineItem', (url, quantity) => {
   cy.visit(url);
@@ -98,81 +56,13 @@ Cypress.Commands.add('addLineItem', (url, quantity) => {
   cy.get('[data-test=mini-cart-content]').should('be.visible');
 });
 
-Cypress.Commands.add('createMyOrder', (cartDraft, orderDraft) => {
-  const createNewOrder = client => client.query({
-    query: gql`
-      query queryCustomerByEmail($predicate: String) {
-        customers(limit: 1, where: $predicate) {
-          results {
-            id
-            version
-          }
-        }
-      }`,
-    variables: { predicate: `email = "${cartDraft.customerEmail}"` },
-    fetchPolicy: 'network-only',
-  }).then((response) => {
-    const customer = response.data.customers.results[0];
-    const draft = Object.assign({}, cartDraft, { customerId: customer.id });
-    return client.mutate({
-      mutation: gql`
-      mutation createMyCart($draft: CartDraft!){
-      createCart (draft: $draft) {
-        id, version
-      }
-  }`,
-      variables: {
-        draft,
-      },
-    });
-  }).then((response) => {
-    const cart = response.data.createCart;
-    const draft = Object.assign({}, orderDraft, { id: cart.id, version: cart.version });
-    client.mutate({
-      mutation: gql`
-          mutation createOrder($draft: OrderCartCommand!){
-            createOrderFromCart(draft: $draft) {
-              id
-            }
-          }`,
-      variables: {
-        draft,
-      },
-    });
-  });
-  return cy.deleteOrder(orderDraft).then(() => cy.wrap(clientPromise.then(client => createNewOrder(client))));
-});
-
-Cypress.Commands.add('deleteOrder', ({ orderNumber }) => {
-  const deleteOrder = client => client.query({
-    query: gql`
-      query queryOrderByNumber($predicate: String) {
-        orders(limit: 1, where: $predicate) {
-          results {
-            version,
-            id
-          }
-        }
-      }`,
-    variables: { predicate: `orderNumber = "${orderNumber}"` },
-    fetchPolicy: 'network-only',
-  }).then(async (response) => {
-    const order = response.data.orders.results[0];
-    if (order) {
-      await client.mutate({
-        mutation: gql`
-            mutation deleteOldOrder($id: String!, $version: Long!) {
-              deleteOrder(id: $id, version: $version) {
-                id
-              }
-            }`,
-        variables: {
-          id: order.id,
-          version: order.version,
-        },
-      }).catch(e => console.warn('Order might have been already deleted', e));
-    }
-  });
-
-  return cy.wrap(clientPromise.then(client => deleteOrder(client)));
-});
+Cypress.Commands.add('createOrder', (cartDraft, orderDraft) => cy.wrap(clientPromise
+  .then(client => mutation.deleteOrder(client, orderDraft.orderNumber)
+    .then(() => query.customerByEmail(client, cartDraft.customerEmail)
+      .then((customer) => {
+        const draft = Object.assign({}, cartDraft, { customerId: customer.id });
+        return mutation.createCart(client, draft);
+      }).then((cart) => {
+        const draft = Object.assign({}, orderDraft, { id: cart.id, version: cart.version });
+        return mutation.createOrder(client, draft);
+      })))));
diff --git a/tests/e2e/support/index.js b/tests/e2e/support/index.js
index 37a498fb..b7d558b9 100644
--- a/tests/e2e/support/index.js
+++ b/tests/e2e/support/index.js
@@ -18,3 +18,10 @@ import './commands';
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
+
+// Required until Cypress supports fetch API
+// https://github.com/cypress-io/cypress/issues/95
+Cypress.on('window:before:load', (win) => {
+  // eslint-disable-next-line no-param-reassign
+  win.fetch = null;
+});
diff --git a/tests/e2e/support/mutations.js b/tests/e2e/support/mutations.js
new file mode 100644
index 00000000..ae1933b8
--- /dev/null
+++ b/tests/e2e/support/mutations.js
@@ -0,0 +1,88 @@
+import gql from 'graphql-tag';
+import * as query from './queries';
+
+export function createCustomer(client, draft) {
+  return client.mutate({
+    mutation: gql`
+      mutation createNewCustomer($draft: CustomerSignMeUpDraft!) {
+        customerSignMeUp(draft: $draft) {
+          customer {
+            id
+          }
+        }
+      }`,
+    variables: {
+      draft,
+    },
+  }).then(response => response.data.customerSignMeUp.customer);
+}
+
+export function createCart(client, draft) {
+  return client.mutate({
+    mutation: gql`
+      mutation createCart($draft: CartDraft!){
+        createCart (draft: $draft) {
+          id, version
+        }
+      }`,
+    variables: {
+      draft,
+    },
+  }).then(response => response.data.createCart);
+}
+
+export function createOrder(client, draft) {
+  return client.mutate({
+    mutation: gql`
+      mutation createOrder($draft: OrderCartCommand!){
+        createOrderFromCart(draft: $draft) {
+          id
+        }
+      }`,
+    variables: {
+      draft,
+    },
+  }).then(response => response.data.createOrderFromCart);
+}
+
+export function deleteOrder(client, orderNumber) {
+  return query.orderByNumber(client, orderNumber)
+    .then(async (order) => {
+      if (order) {
+        await client.mutate({
+          mutation: gql`
+            mutation deleteOrder($id: String!, $version: Long!) {
+              deleteOrder(id: $id, version: $version) {
+                id
+              }
+            }`,
+          variables: {
+            id: order.id,
+            version: order.version,
+          },
+        }).then(response => response.data.deleteOrder)
+          .catch(e => console.warn('Order might have already been deleted', e));
+      }
+    });
+}
+
+export function deleteCustomer(client, email) {
+  return query.customerByEmail(client, email)
+    .then(async (customer) => {
+      if (customer) {
+        await client.mutate({
+          mutation: gql`
+            mutation deleteCustomer($id: String!, $version: Long!) {
+              deleteCustomer(id: $id, version: $version, personalDataErasure: true) {
+                id
+              }
+            }`,
+          variables: {
+            id: customer.id,
+            version: customer.version,
+          },
+        }).then(response => response.data.deleteCustomer)
+          .catch(e => console.warn('Customer might have already been deleted', e));
+      }
+    });
+}
diff --git a/tests/e2e/support/queries.js b/tests/e2e/support/queries.js
new file mode 100644
index 00000000..7847474d
--- /dev/null
+++ b/tests/e2e/support/queries.js
@@ -0,0 +1,33 @@
+import gql from 'graphql-tag';
+
+export function customerByEmail(client, email) {
+  return client.query({
+    query: gql`
+      query queryCustomerByEmail($predicate: String) {
+        customers(limit: 1, where: $predicate) {
+          results {
+            id
+            version
+          }
+        }
+      }`,
+    variables: { predicate: `email = "${email}"` },
+    fetchPolicy: 'network-only',
+  }).then(response => response.data.customers.results[0]);
+}
+
+export function orderByNumber(client, orderNumber) {
+  return client.query({
+    query: gql`
+      query queryOrderByNumber($predicate: String) {
+        orders(limit: 1, where: $predicate) {
+          results {
+            version,
+            id
+          }
+        }
+      }`,
+    variables: { predicate: `orderNumber = "${orderNumber}"` },
+    fetchPolicy: 'network-only',
+  }).then(response => response.data.orders.results[0]);
+}
diff --git a/yarn.lock b/yarn.lock
index 47d3c9bd..55dd6e58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7971,11 +7971,6 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -12301,6 +12296,11 @@ whatwg-fetch@2.0.4:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
   integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
 
+whatwg-fetch@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
+  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
+
 whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"

From f52c418caf8fdad6987bbbcf6946253dc230099d Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 17 Jun 2019 18:17:50 +0200
Subject: [PATCH 14/69] Fix unit/e2e tests

---
 .../cartdetail/LineItemQuantityForm.vue       |  2 +-
 src/components/cartdetail/PageCartDetail.vue  |  8 +-
 src/components/common/form/BaseInput.vue      |  3 +-
 .../common/{ => form}/BaseLabel.vue           |  9 +-
 src/components/common/form/BaseSelect.vue     |  3 +-
 .../userdetail/EditProfileForm.vue            |  8 +-
 src/mixins/cartMixin.js                       | 14 ++-
 .../components/cartdetail/LineItem.spec.js    | 88 ------------------
 .../cartdetail/LineItemQuantityForm.spec.js   | 64 +++++++++++++
 .../CartLikePriceDetail.spec.js}              | 10 +-
 .../common/ProductThumbnail.spec.js           | 16 ----
 .../components/common/form/BaseInput.spec.js  | 45 +++++++++
 .../components/common/form/BaseLabel.spec.js  | 38 ++++++++
 .../components/common/form/BaseSelect.spec.js | 35 +++++++
 .../common/{ => form}/ServerError.spec.js     |  2 +-
 .../common/{ => form}/ValidationError.spec.js | 20 ++--
 .../specs/components/header/MiniCart.spec.js  | 43 +--------
 .../specs/components/login/LoginForm.spec.js  | 54 +----------
 .../specs/components/login/SignUpForm.spec.js | 57 ------------
 .../productdetail/AddToCartForm.spec.js       | 52 ++++-------
 .../userprofile/EditProfileForm.spec.js       | 91 +++----------------
 ...{myOrders.spec.js => TabOrderList.spec.js} |  0
 tests/unit/specs/mixin/cartMixin.spec.js      | 86 ++++++++++++------
 23 files changed, 313 insertions(+), 435 deletions(-)
 rename src/components/common/{ => form}/BaseLabel.vue (78%)
 delete mode 100644 tests/unit/specs/components/cartdetail/LineItem.spec.js
 create mode 100644 tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
 rename tests/unit/specs/components/{cartdetail/PriceCalculation.spec.js => common/CartLikePriceDetail.spec.js} (82%)
 create mode 100644 tests/unit/specs/components/common/form/BaseInput.spec.js
 create mode 100644 tests/unit/specs/components/common/form/BaseLabel.spec.js
 create mode 100644 tests/unit/specs/components/common/form/BaseSelect.spec.js
 rename tests/unit/specs/components/common/{ => form}/ServerError.spec.js (98%)
 rename tests/unit/specs/components/common/{ => form}/ValidationError.spec.js (84%)
 rename tests/unit/specs/components/userprofile/{myOrders.spec.js => TabOrderList.spec.js} (100%)

diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
index 45451685..cbd997f8 100644
--- a/src/components/cartdetail/LineItemQuantityForm.vue
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -42,7 +42,7 @@ export default {
 
   data: () => ({
     form: {
-      quantity: 1,
+      quantity: null,
     },
   }),
 
diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index 05b16706..9e86ee68 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -18,7 +18,7 @@
         <!--{{> checkout/start-checkout-link id="cart-checkoutnow-btn"}}-->
       </div>
     </div>
-    <div v-if="notEmpty">
+    <div v-if="cartNotEmpty">
       <div class="row">
         <div class="col-sm-12">
           <div class="cart-content">
@@ -78,12 +78,6 @@ export default {
 
   mixins: [cartMixin],
 
-  computed: {
-    notEmpty() {
-      return this.me?.activeCart?.lineItems.length > 0;
-    },
-  },
-
   apollo: {
     me: {
       query: gql`
diff --git a/src/components/common/form/BaseInput.vue b/src/components/common/form/BaseInput.vue
index cec821a3..9a93f502 100644
--- a/src/components/common/form/BaseInput.vue
+++ b/src/components/common/form/BaseInput.vue
@@ -18,7 +18,7 @@
 
 <script>
 import ValidationError from './ValidationError.vue';
-import BaseLabel from '../BaseLabel.vue';
+import BaseLabel from './BaseLabel.vue';
 
 export default {
   inheritAttrs: false,
@@ -31,6 +31,7 @@ export default {
   props: {
     value: {
       type: [String, Number, Boolean],
+      default: null,
     },
     vuelidate: {
       type: Object,
diff --git a/src/components/common/BaseLabel.vue b/src/components/common/form/BaseLabel.vue
similarity index 78%
rename from src/components/common/BaseLabel.vue
rename to src/components/common/form/BaseLabel.vue
index 131bd979..340742f4 100644
--- a/src/components/common/BaseLabel.vue
+++ b/src/components/common/form/BaseLabel.vue
@@ -1,10 +1,10 @@
 <template>
-  <label v-if="label"
-         class="field-label">
+  <label class="field-label">
     <span class="text">{{ label }}</span>
     <span v-if="required"
           :title="$t('required')"
-          class="field-required">
+          class="field-required"
+          data-test="form-label-required">
       *
     </span>
     <slot></slot>
@@ -20,12 +20,13 @@ export default {
     },
     label: {
       type: String,
+      required: true,
     },
   },
 
   computed: {
     required() {
-      return this.vuelidate.$params.required;
+      return this.vuelidate.$params?.required;
     },
   },
 };
diff --git a/src/components/common/form/BaseSelect.vue b/src/components/common/form/BaseSelect.vue
index e2945826..173021e2 100644
--- a/src/components/common/form/BaseSelect.vue
+++ b/src/components/common/form/BaseSelect.vue
@@ -15,7 +15,7 @@
 <script>
 import ValidationError from './ValidationError.vue';
 import SelectBoxIt from '../SelectBoxIt.vue';
-import BaseLabel from '../BaseLabel.vue';
+import BaseLabel from './BaseLabel.vue';
 
 export default {
   inheritAttrs: false,
@@ -29,6 +29,7 @@ export default {
   props: {
     value: {
       type: [String, Number, Boolean],
+      default: null,
     },
     vuelidate: {
       type: Object,
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index c728396e..d577b659 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -141,18 +141,12 @@ export default {
     },
 
     openForm() {
+      this.form = { ...this.me.customer };
       this.showForm = true;
     },
 
     closeForm() {
       this.showForm = false;
-      this.$v.$reset();
-    },
-  },
-
-  watch: {
-    me(value) {
-      this.form = { ...value.customer };
     },
   },
 
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index a80530ce..b137b061 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -2,21 +2,29 @@ import gql from 'graphql-tag';
 import BASIC_CART_QUERY from '../components/BasicCart.gql';
 import DISPLAYABLE_MONEY_FRAGMENT from '../components/DisplayableMoney.gql';
 
+function cartExists(vm) {
+  return vm.me?.activeCart;
+}
+
 export default {
   computed: {
     cartExists() {
-      return this.me?.activeCart;
+      return cartExists(this);
+    },
+
+    cartNotEmpty() {
+      return this.me?.activeCart?.lineItems.length > 0;
     },
 
     totalItems() {
-      if (this.cartExists) {
+      if (cartExists(this)) {
         return this.me.activeCart.lineItems.reduce((acc, li) => acc + li.quantity, 0);
       }
       return 0;
     },
 
     sortedLineItems() {
-      if (this.cartExists) {
+      if (cartExists(this)) {
         return [...this.me.activeCart.lineItems].reverse();
       }
       return [];
diff --git a/tests/unit/specs/components/cartdetail/LineItem.spec.js b/tests/unit/specs/components/cartdetail/LineItem.spec.js
deleted file mode 100644
index 0e7c5f44..00000000
--- a/tests/unit/specs/components/cartdetail/LineItem.spec.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import Vuelidate from 'vuelidate';
-import { shallowMount, createLocalVue } from '@vue/test-utils';
-import LineItem from '@/components/common/LineItem.vue';
-
-jest.mock('lodash.debounce', () => jest.fn(fn => fn));
-
-const localVue = createLocalVue();
-localVue.use(Vuelidate);
-
-function setInputValue(input, value) {
-  input.setValue(value);
-  input.trigger('change');
-  input.trigger('blur');
-}
-
-describe('LineItem.vue', () => {
-  let lineItem;
-  let options;
-
-  beforeEach(() => {
-    lineItem = {
-      id: 'li-id',
-      quantity: 3,
-      variant: {},
-      price: {},
-      totalPrice: {},
-    };
-
-    options = {
-      localVue,
-      methods: { formatPrice: jest.fn() },
-      mocks: { $t: jest.fn() },
-      propsData: { lineItem },
-      stubs: { 'router-link': true },
-    };
-  });
-
-  it('renders a vue instance', () => {
-    expect(shallowMount(LineItem, options).isVueInstance()).toBeTruthy();
-  });
-
-  it('emits event on quantity changed', () => {
-    options.propsData.editable = true;
-    const wrapper = shallowMount(LineItem, options);
-    expect(wrapper.vm.quantity).toBe(3);
-
-    setInputValue(wrapper.find('[data-test="cart-line-item-quantity"]'), 8);
-    wrapper.vm.$forceUpdate();
-    expect(wrapper.vm.quantity).toBe(8);
-    expect(wrapper.emitted('changeLineItemQuantity')[0]).toEqual(['li-id', 8]);
-
-    setInputValue(wrapper.find('[data-test="cart-line-item-quantity"]'), 8);
-    wrapper.vm.$forceUpdate();
-    expect(wrapper.vm.quantity).toBe(8);
-    expect(wrapper.emitted('changeLineItemQuantity')[1]).toBeUndefined();
-  });
-
-  it('does not emit event on wrong quantity', () => {
-    options.propsData.editable = true;
-    const wrapper = shallowMount(LineItem, options);
-
-    setInputValue(wrapper.find('[data-test="cart-line-item-quantity"]'), 'wrong');
-    wrapper.vm.$forceUpdate();
-    expect(wrapper.emitted('changeLineItemQuantity')).toBeUndefined();
-  });
-
-  it('emits event on increment/decrement buttons clicked', () => {
-    options.propsData.editable = true;
-    const wrapper = shallowMount(LineItem, options);
-    expect(wrapper.vm.quantity).toBe(3);
-
-    wrapper.find('[data-test="cart-line-item-quantity-inc"]').trigger('click');
-    expect(wrapper.vm.quantity).toBe(4);
-    expect(wrapper.emitted('changeLineItemQuantity')[0]).toEqual(['li-id', 4]);
-
-    wrapper.find('[data-test="cart-line-item-quantity-dec"]').trigger('click');
-    expect(wrapper.vm.quantity).toBe(3);
-    expect(wrapper.emitted('changeLineItemQuantity')[1]).toEqual(['li-id', 3]);
-  });
-
-  it('emits event on remove button clicked', () => {
-    options.propsData.editable = true;
-    const wrapper = shallowMount(LineItem, options);
-
-    wrapper.find('[data-test="cart-line-item-delete"]').trigger('click');
-    expect(wrapper.emitted('removeLineItem')[0]).toEqual(['li-id']);
-  });
-});
diff --git a/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js b/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
new file mode 100644
index 00000000..ff0a4911
--- /dev/null
+++ b/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
@@ -0,0 +1,64 @@
+import Vuelidate from 'vuelidate';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import LineItemQuantityForm from '@/components/cartdetail/LineItemQuantityForm.vue';
+
+jest.mock('lodash.debounce', () => jest.fn(fn => fn));
+
+const localVue = createLocalVue();
+localVue.use(Vuelidate);
+
+describe('LineItemQuantityForm.vue', () => {
+  let mockedDebounced;
+  let options;
+
+  beforeEach(() => {
+    mockedDebounced = jest.fn();
+
+    options = {
+      localVue,
+      propsData: { lineItemId: 'li-id', quantity: 3 },
+      computed: { cartExists: () => true },
+      methods: { submit: mockedDebounced },
+    };
+  });
+
+  it('renders a vue instance', () => {
+    expect(shallowMount(LineItemQuantityForm, options).isVueInstance()).toBeTruthy();
+  });
+
+  it('does not submit on created', () => {
+    shallowMount(LineItemQuantityForm, options);
+    expect(mockedDebounced).not.toBeCalled();
+  });
+
+  it('does not submit on same quantity changed', () => {
+    const wrapper = shallowMount(LineItemQuantityForm, options);
+    wrapper.setData({ form: { quantity: 3 } });
+    expect(mockedDebounced).not.toBeCalled();
+  });
+
+  it('submits when quantity changes', () => {
+    const wrapper = shallowMount(LineItemQuantityForm, options);
+    wrapper.setData({ form: { quantity: 8 } });
+    expect(mockedDebounced).toBeCalled();
+  });
+
+  it('does not submit when quantity is wrong', () => {
+    const wrapper = shallowMount(LineItemQuantityForm, options);
+    wrapper.setData({ form: { quantity: 'wrong' } });
+    expect(mockedDebounced).not.toBeCalled();
+  });
+
+
+  it('submits on increment/decrement buttons clicked', () => {
+    const wrapper = shallowMount(LineItemQuantityForm, options);
+
+    wrapper.find('[data-test="cart-line-item-quantity-inc"]').trigger('click');
+    expect(wrapper.vm.form.quantity).toBe(4);
+    expect(mockedDebounced).toBeCalledTimes(1);
+
+    wrapper.find('[data-test="cart-line-item-quantity-dec"]').trigger('click');
+    expect(wrapper.vm.form.quantity).toBe(3);
+    expect(mockedDebounced).toBeCalledTimes(2);
+  });
+});
diff --git a/tests/unit/specs/components/cartdetail/PriceCalculation.spec.js b/tests/unit/specs/components/common/CartLikePriceDetail.spec.js
similarity index 82%
rename from tests/unit/specs/components/cartdetail/PriceCalculation.spec.js
rename to tests/unit/specs/components/common/CartLikePriceDetail.spec.js
index 517381ba..308cfe74 100644
--- a/tests/unit/specs/components/cartdetail/PriceCalculation.spec.js
+++ b/tests/unit/specs/components/common/CartLikePriceDetail.spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
-import PriceCalculation from '@/components/common/PriceCalculation.vue';
+import CartLikePriceDetail from '@/components/common/CartLikePriceDetail.vue';
 
-describe('PriceCalculation.vue', () => {
+describe('CartLikePriceDetail.vue', () => {
   const cartLike = {
     lineItems: [],
     totalPrice: {
@@ -22,11 +22,11 @@ describe('PriceCalculation.vue', () => {
   });
 
   it('renders a vue instance', () => {
-    expect(shallowMount(PriceCalculation, options).isVueInstance()).toBeTruthy();
+    expect(shallowMount(CartLikePriceDetail, options).isVueInstance()).toBeTruthy();
   });
 
   it('calculates applied taxes', () => {
-    const wrapper = shallowMount(PriceCalculation, options);
+    const wrapper = shallowMount(CartLikePriceDetail, options);
     expect(wrapper.vm.taxes).toBeNull();
 
     wrapper.setProps({
@@ -54,7 +54,7 @@ describe('PriceCalculation.vue', () => {
   });
 
   it('calculates subtotal price', () => {
-    const wrapper = shallowMount(PriceCalculation, options);
+    const wrapper = shallowMount(CartLikePriceDetail, options);
     expect(wrapper.vm.subtotal).toEqual({
       centAmount: 0,
       currencyCode: 'EUR',
diff --git a/tests/unit/specs/components/common/ProductThumbnail.spec.js b/tests/unit/specs/components/common/ProductThumbnail.spec.js
index c5010870..5beb5e31 100644
--- a/tests/unit/specs/components/common/ProductThumbnail.spec.js
+++ b/tests/unit/specs/components/common/ProductThumbnail.spec.js
@@ -51,20 +51,4 @@ describe('ProductThumbnail.vue', () => {
     wrapper.setProps({ product: { ...options.propsData.product } });
     expect(wrapper.vm.hasImages).toBeFalsy();
   });
-
-  it('obtains the product slug', () => {
-    const slug = { foo: 'bar' };
-    options.propsData.product.masterData.current.slug = slug;
-    const wrapper = shallowMount(ProductThumbnail, options);
-
-    expect(wrapper.vm.productSlug).toEqual(slug);
-  });
-
-  it('obtains the product sku', () => {
-    const sku = { foo: 'bar' };
-    options.propsData.product.masterData.current.masterVariant.sku = sku;
-    const wrapper = shallowMount(ProductThumbnail, options);
-
-    expect(wrapper.vm.sku).toEqual(sku);
-  });
 });
diff --git a/tests/unit/specs/components/common/form/BaseInput.spec.js b/tests/unit/specs/components/common/form/BaseInput.spec.js
new file mode 100644
index 00000000..445c582f
--- /dev/null
+++ b/tests/unit/specs/components/common/form/BaseInput.spec.js
@@ -0,0 +1,45 @@
+import { shallowMount } from '@vue/test-utils';
+import BaseInput from '@/components/common/form/BaseInput.vue';
+import BaseLabel from '@/components/common/form/BaseLabel.vue';
+
+describe('BaseInput.vue', () => {
+  let options;
+
+  beforeEach(() => {
+    options = {
+      propsData: {
+        vuelidate: {
+          $touch: jest.fn(),
+        },
+      },
+    };
+  });
+
+  it('renders a vue instance', () => {
+    expect(shallowMount(BaseInput, options).isVueInstance()).toBeTruthy();
+  });
+
+  it('updates model with prop value', () => {
+    const wrapper = shallowMount(BaseInput, options);
+    expect(wrapper.vm.model).toBeNull();
+
+    wrapper.setProps({ value: 'some val' });
+    expect(wrapper.vm.model).toBe('some val');
+  });
+
+  it('emits input changes', () => {
+    const wrapper = shallowMount(BaseInput, options);
+    wrapper.find('input').setValue('some val');
+    expect(wrapper.emitted('input')[0]).toEqual(['some val']);
+  });
+
+  it('nests input in label if it exists', () => {
+    const wrapper = shallowMount(BaseInput, options);
+    expect(wrapper.find(BaseLabel).exists()).toBeFalsy();
+    expect(wrapper.findAll('input').length).toBe(1);
+
+    wrapper.setProps({ label: 'Some label' });
+    expect(wrapper.find(BaseLabel).find('input').exists()).toBeTruthy();
+    expect(wrapper.findAll('input').length).toBe(1);
+  });
+});
diff --git a/tests/unit/specs/components/common/form/BaseLabel.spec.js b/tests/unit/specs/components/common/form/BaseLabel.spec.js
new file mode 100644
index 00000000..d019d0cd
--- /dev/null
+++ b/tests/unit/specs/components/common/form/BaseLabel.spec.js
@@ -0,0 +1,38 @@
+import { shallowMount } from '@vue/test-utils';
+import BaseLabel from '@/components/common/form/BaseLabel.vue';
+
+describe('BaseLabel.vue', () => {
+  let options;
+
+  beforeEach(() => {
+    options = {
+      mocks: { $t: jest.fn() },
+      propsData: {
+        vuelidate: {},
+        label: 'Some Label',
+      },
+    };
+  });
+
+  it('renders a vue instance', () => {
+    expect(shallowMount(BaseLabel, options).isVueInstance()).toBeTruthy();
+  });
+
+  it('shows required on validation required', () => {
+    const wrapper = shallowMount(BaseLabel, options);
+    expect(wrapper.vm.required).toBeFalsy();
+    expect(wrapper.find('[data-test="form-label-required"]').exists()).toBeFalsy();
+
+    wrapper.setProps({
+      vuelidate: {
+        $params: {
+          required: {
+            type: 'required',
+          },
+        },
+      },
+    });
+    expect(wrapper.vm.required).toBeTruthy();
+    expect(wrapper.find('[data-test="form-label-required"]').exists()).toBeTruthy();
+  });
+});
diff --git a/tests/unit/specs/components/common/form/BaseSelect.spec.js b/tests/unit/specs/components/common/form/BaseSelect.spec.js
new file mode 100644
index 00000000..5a9c4b5b
--- /dev/null
+++ b/tests/unit/specs/components/common/form/BaseSelect.spec.js
@@ -0,0 +1,35 @@
+import { shallowMount } from '@vue/test-utils';
+import BaseSelect from '@/components/common/form/BaseSelect.vue';
+
+describe('BaseSelect.vue', () => {
+  let options;
+
+  beforeEach(() => {
+    options = {
+      propsData: {
+        options: [],
+        vuelidate: {
+          $touch: jest.fn(),
+        },
+      },
+    };
+  });
+
+  it('renders a vue instance', () => {
+    expect(shallowMount(BaseSelect, options).isVueInstance()).toBeTruthy();
+  });
+
+  it('updates model with prop value', () => {
+    const wrapper = shallowMount(BaseSelect, options);
+    expect(wrapper.vm.model).toBeNull();
+
+    wrapper.setProps({ value: 'some val' });
+    expect(wrapper.vm.model).toBe('some val');
+  });
+
+  it('emits input changes', () => {
+    const wrapper = shallowMount(BaseSelect, options);
+    wrapper.setData({ model: 'some val' });
+    expect(wrapper.emitted('input')[0]).toEqual(['some val']);
+  });
+});
diff --git a/tests/unit/specs/components/common/ServerError.spec.js b/tests/unit/specs/components/common/form/ServerError.spec.js
similarity index 98%
rename from tests/unit/specs/components/common/ServerError.spec.js
rename to tests/unit/specs/components/common/form/ServerError.spec.js
index 7a4ac31a..771a9854 100644
--- a/tests/unit/specs/components/common/ServerError.spec.js
+++ b/tests/unit/specs/components/common/form/ServerError.spec.js
@@ -1,7 +1,7 @@
 import VueI18n from 'vue-i18n';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import { ApolloError } from 'apollo-client';
-import ServerError from '@/components/common/ServerError.vue';
+import ServerError from '@/components/common/form/ServerError.vue';
 
 const localVue = createLocalVue();
 localVue.use(VueI18n);
diff --git a/tests/unit/specs/components/common/ValidationError.spec.js b/tests/unit/specs/components/common/form/ValidationError.spec.js
similarity index 84%
rename from tests/unit/specs/components/common/ValidationError.spec.js
rename to tests/unit/specs/components/common/form/ValidationError.spec.js
index a2c98c1b..7e1842ad 100644
--- a/tests/unit/specs/components/common/ValidationError.spec.js
+++ b/tests/unit/specs/components/common/form/ValidationError.spec.js
@@ -1,6 +1,6 @@
 import VueI18n from 'vue-i18n';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import ValidationError from '@/components/common/ValidationError.vue';
+import ValidationError from '@/components/common/form/ValidationError.vue';
 
 const localVue = createLocalVue();
 localVue.use(VueI18n);
@@ -62,9 +62,9 @@ describe('ValidationError.vue', () => {
     expect(wrapper.vm.getErrorMessage('required')).toEqual(requiredTranslation);
 
     wrapper.setProps({
-      customMessages: { required: 'custom message' },
+      customErrors: { required: 'custom error' },
     });
-    expect(wrapper.vm.getErrorMessage('required')).toEqual('custom message');
+    expect(wrapper.vm.getErrorMessage('required')).toEqual('custom error');
   });
 
   it('returns unknown validation when no translation available', () => {
@@ -92,19 +92,13 @@ describe('ValidationError.vue', () => {
   });
 
   it('does not render errors if no error flag', () => {
-    options.slots = {
-      default: '<input data-test="validation-error-test-input"></input>',
-    };
     const wrapper = shallowMount(ValidationError, options);
-
     wrapper.setProps({
       vuelidate: {
         $error: false,
         $params: {},
       },
     });
-    expect(wrapper.find('div.form-error').exists()).toBe(false);
-    expect(wrapper.find('input').exists()).toBe(true);
     expect(wrapper.find('[data-test="validation-error-list"]').exists()).toBe(false);
 
     wrapper.setProps({
@@ -113,8 +107,6 @@ describe('ValidationError.vue', () => {
         $params: {},
       },
     });
-    expect(wrapper.find('div.form-error').exists()).toBe(true);
-    expect(wrapper.find('input').exists()).toBe(true);
     expect(wrapper.find('[data-test="validation-error-list"]').exists()).toBe(true);
   });
 
@@ -128,15 +120,15 @@ describe('ValidationError.vue', () => {
         $params: {
           required: { type: 'required' },
           email: { type: 'email' },
-          custom: { type: 'custom error' },
+          custom: { type: 'custom' },
         },
       },
-      customMessages: { custom: 'custom message' },
+      customErrors: { custom: 'custom error' },
     });
     const errors = wrapper.findAll('[data-test="validation-error"]');
     expect(errors.length).toBe(3);
     expect(errors.at(0).text()).toBe(requiredTranslation);
     expect(errors.at(1).text()).toBe(unknownValidationTranslation);
-    expect(errors.at(2).text()).toBe('custom message');
+    expect(errors.at(2).text()).toBe('custom error');
   });
 });
diff --git a/tests/unit/specs/components/header/MiniCart.spec.js b/tests/unit/specs/components/header/MiniCart.spec.js
index 24359809..be64802f 100644
--- a/tests/unit/specs/components/header/MiniCart.spec.js
+++ b/tests/unit/specs/components/header/MiniCart.spec.js
@@ -6,22 +6,17 @@ const localVue = createLocalVue();
 localVue.use(Vuex);
 
 describe('MiniCart.vue', () => {
-  const lineItem = {
+  const lineItem = id => ({
+    id,
     quantity: 3,
     variant: {},
     totalPrice: {},
-  };
+  });
 
-  let me;
   let state;
   let options;
 
   beforeEach(() => {
-    me = {
-      activeCart: {
-        lineItems: [],
-      },
-    };
     state = { miniCartOpen: false };
 
     options = {
@@ -37,34 +32,6 @@ describe('MiniCart.vue', () => {
     expect(shallowMount(MiniCart, options).isVueInstance()).toBeTruthy();
   });
 
-  it('sorts line items', () => {
-    const wrapper = shallowMount(MiniCart, options);
-    wrapper.setData({ me });
-    expect(wrapper.vm.sortedLineItems).toEqual([]);
-
-    wrapper.setData({
-      me: {
-        activeCart: {
-          lineItems: [{ id: 'id1' }],
-        },
-      },
-    });
-    expect(wrapper.vm.sortedLineItems).toEqual([{ id: 'id1' }]);
-
-    wrapper.setData({
-      me: {
-        activeCart: {
-          lineItems: [{ id: 'id1' }, { id: 'id2' }, { id: 'id3' }],
-        },
-      },
-    });
-    expect(wrapper.vm.sortedLineItems).toEqual([
-      { id: 'id3' },
-      { id: 'id2' },
-      { id: 'id1' },
-    ]);
-  });
-
   it('close it according to store', () => {
     state.miniCartOpen = false;
     const wrapper = shallowMount(MiniCart, options);
@@ -75,7 +42,7 @@ describe('MiniCart.vue', () => {
     wrapper.setData({
       me: {
         activeCart: {
-          lineItems: [lineItem, lineItem, lineItem],
+          lineItems: [lineItem('id1'), lineItem('id2'), lineItem('id3')],
           totalPrice: {},
         },
       },
@@ -95,7 +62,7 @@ describe('MiniCart.vue', () => {
     wrapper.setData({
       me: {
         activeCart: {
-          lineItems: [lineItem, lineItem, lineItem],
+          lineItems: [lineItem('id1'), lineItem('id2'), lineItem('id3')],
           totalPrice: {},
         },
       },
diff --git a/tests/unit/specs/components/login/LoginForm.spec.js b/tests/unit/specs/components/login/LoginForm.spec.js
index d6cf8acc..6df1e0e9 100644
--- a/tests/unit/specs/components/login/LoginForm.spec.js
+++ b/tests/unit/specs/components/login/LoginForm.spec.js
@@ -1,75 +1,23 @@
 import Vuelidate from 'vuelidate';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import { ApolloError } from 'apollo-client';
 import LoginForm from '@/components/login/LoginForm.vue';
-import ServerError from '@/components/common/ServerError.vue';
-import ValidationError from '@/components/common/ValidationError.vue';
-
-jest.mock('@/auth', () => ({ clientLogin: jest.fn() }));
 
 const localVue = createLocalVue();
 localVue.use(Vuelidate);
 
-function setInputValue(input, value) {
-  input.setValue(value);
-  input.trigger('change');
-  input.trigger('blur');
-}
-
-function fillForm(wrapper, credentials) {
-  setInputValue(wrapper.find('[data-test="login-form-email"]'), credentials.email);
-  setInputValue(wrapper.find('[data-test="login-form-password"]'), credentials.password);
-}
+jest.mock('@/auth', () => ({ clientLogin: jest.fn() }));
 
 describe('LoginForm.vue', () => {
-  const credentials = {
-    email: 'willy.wonka@commercetools.com',
-    password: 'p@ssword',
-  };
-
   let options;
 
   beforeEach(() => {
     options = {
       localVue,
       mocks: { $t: jest.fn() },
-      methods: { customerSignMeIn: jest.fn() },
     };
   });
 
   it('renders a vue instance', () => {
     expect(shallowMount(LoginForm, options).isVueInstance()).toBeTruthy();
   });
-
-  it('logs in when form is valid', () => {
-    const wrapper = shallowMount(LoginForm, options);
-    wrapper.vm.submit();
-    expect(options.methods.customerSignMeIn).not.toHaveBeenCalled();
-
-    setInputValue(wrapper.find('[data-test="login-form-email"]'), credentials.email);
-    wrapper.vm.submit();
-    expect(options.methods.customerSignMeIn).not.toHaveBeenCalled();
-
-    fillForm(wrapper, credentials);
-    wrapper.vm.submit();
-    expect(options.methods.customerSignMeIn).toHaveBeenCalled();
-  });
-
-  it('shows form errors', () => {
-    const wrapper = shallowMount(LoginForm, options);
-    expect(wrapper.findAll(ValidationError).length).toBe(2);
-  });
-
-  it('catches server errors', async () => {
-    const wrapper = shallowMount(LoginForm, options);
-    expect(wrapper.find(ServerError).props().error).toBeNull();
-
-    const error = new ApolloError({
-      graphQLErrors: [{ code: 'Error1' }, { code: 'Error2' }],
-    });
-    options.methods.customerSignMeIn.mockRejectedValue(error);
-    fillForm(wrapper, credentials);
-    await wrapper.vm.submit();
-    expect(wrapper.find(ServerError).props().error).toEqual(error);
-  });
 });
diff --git a/tests/unit/specs/components/login/SignUpForm.spec.js b/tests/unit/specs/components/login/SignUpForm.spec.js
index 52ae45cf..70f8f5b2 100644
--- a/tests/unit/specs/components/login/SignUpForm.spec.js
+++ b/tests/unit/specs/components/login/SignUpForm.spec.js
@@ -1,38 +1,13 @@
 import Vuelidate from 'vuelidate';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import { ApolloError } from 'apollo-client';
 import SignUpForm from '@/components/login/SignUpForm.vue';
-import ServerError from '@/components/common/ServerError.vue';
-import ValidationError from '@/components/common/ValidationError.vue';
 
 jest.mock('@/auth', () => ({ clientLogin: jest.fn() }));
 
 const localVue = createLocalVue();
 localVue.use(Vuelidate);
 
-function setInputValue(input, value) {
-  input.setValue(value);
-  input.trigger('change');
-  input.trigger('blur');
-}
-
-function fillForm(wrapper, customer) {
-  setInputValue(wrapper.find('[data-test="signup-form-firstname"]'), customer.firstName);
-  setInputValue(wrapper.find('[data-test="signup-form-lastname"]'), customer.lastName);
-  setInputValue(wrapper.find('[data-test="signup-form-email"]'), customer.email);
-  setInputValue(wrapper.find('[data-test="signup-form-password"]'), customer.password);
-  setInputValue(wrapper.find('[data-test="signup-form-repeatpassword"]'), customer.password);
-  wrapper.find('[data-test="signup-form-agreetoterms"]').setChecked(true);
-}
-
 describe('SignUpForm.vue', () => {
-  const customer = {
-    firstName: 'Willy',
-    lastName: 'Wonka',
-    email: 'willy.wonka@commercetools.com',
-    password: 'p@ssword',
-  };
-
   let options;
 
   beforeEach(() => {
@@ -46,36 +21,4 @@ describe('SignUpForm.vue', () => {
   it('renders a vue instance', () => {
     expect(shallowMount(SignUpForm, options).isVueInstance()).toBeTruthy();
   });
-
-  it('signs up when form is valid', () => {
-    const wrapper = shallowMount(SignUpForm, options);
-    wrapper.vm.submit();
-    expect(options.methods.customerSignMeUp).not.toHaveBeenCalled();
-
-    setInputValue(wrapper.find('[data-test="signup-form-email"]'), customer.email);
-    wrapper.vm.submit();
-    expect(options.methods.customerSignMeUp).not.toHaveBeenCalled();
-
-    fillForm(wrapper, customer);
-    wrapper.vm.submit();
-    expect(options.methods.customerSignMeUp).toHaveBeenCalled();
-  });
-
-  it('shows form errors', () => {
-    const wrapper = shallowMount(SignUpForm, options);
-    expect(wrapper.findAll(ValidationError).length).toBe(6);
-  });
-
-  it('catches server errors', async () => {
-    const wrapper = shallowMount(SignUpForm, options);
-    expect(wrapper.find(ServerError).props().error).toBeNull();
-
-    const error = new ApolloError({
-      graphQLErrors: [{ code: 'Error1' }, { code: 'Error2' }],
-    });
-    options.methods.customerSignMeUp.mockRejectedValue(error);
-    fillForm(wrapper, customer);
-    await wrapper.vm.submit();
-    expect(wrapper.find(ServerError).props().error).toEqual(error);
-  });
 });
diff --git a/tests/unit/specs/components/productdetail/AddToCartForm.spec.js b/tests/unit/specs/components/productdetail/AddToCartForm.spec.js
index 4e17dec0..ef3a7196 100644
--- a/tests/unit/specs/components/productdetail/AddToCartForm.spec.js
+++ b/tests/unit/specs/components/productdetail/AddToCartForm.spec.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import Vuex from 'vuex';
 import Vuelidate from 'vuelidate';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import AddToCartForm from '@/components/productdetail/AddToCartForm.vue';
@@ -6,20 +7,26 @@ import SelectBoxIt from '@/components/common/SelectBoxIt.vue';
 
 const localVue = createLocalVue();
 localVue.use(Vuelidate);
+localVue.use(Vuex);
 
 Vue.component('SelectBoxIt', SelectBoxIt);
 
 describe('AddToCartForm.vue', () => {
+  let actions;
   let options;
 
   beforeEach(() => {
+    actions = { openMiniCart: jest.fn() };
+
     options = {
       localVue,
       mocks: { $t: jest.fn() },
+      store: new Vuex.Store({ actions }),
       propsData: { sku: 'some-sku' },
+      computed: { currency: () => 'EUR' },
       methods: {
-        createCart: jest.fn(),
-        updateMyCart: jest.fn(),
+        createMyCart: jest.fn(() => Promise.resolve({})),
+        updateMyCart: jest.fn(() => Promise.resolve({})),
       },
     };
   });
@@ -31,43 +38,24 @@ describe('AddToCartForm.vue', () => {
   it('returns the quantities to be displayed', () => {
     const wrapper = shallowMount(AddToCartForm, options);
     expect(wrapper.vm.quantities.length).toBe(10);
-
-    wrapper.setData({ maxQuantity: 1 });
-    expect(wrapper.vm.quantities).toEqual([
-      { id: 1, name: 1 },
-    ]);
-
-    wrapper.setData({ maxQuantity: 5 });
-    expect(wrapper.vm.quantities).toEqual([
-      { id: 1, name: 1 },
-      { id: 2, name: 2 },
-      { id: 3, name: 3 },
-      { id: 4, name: 4 },
-      { id: 5, name: 5 },
-    ]);
+    expect(wrapper.vm.quantities[2]).toEqual({ id: 3, name: 3 });
   });
 
   it('on submit it creates a cart when cart does not exist', async () => {
+    options.computed.cartExists = () => false;
     const wrapper = shallowMount(AddToCartForm, options);
-    wrapper.setData({
-      me: {},
-    });
-
-    await wrapper.vm.submit();
-    expect(options.methods.createCart).toHaveBeenCalled();
-    expect(options.methods.updateMyCart).toHaveBeenCalled();
+    await wrapper.vm.addLineItem();
+    expect(options.methods.createMyCart).toBeCalled();
+    expect(options.methods.updateMyCart).toBeCalled();
+    expect(actions.openMiniCart).toBeCalled();
   });
 
   it('on submit it does not create a cart if it exists', async () => {
+    options.computed.cartExists = () => true;
     const wrapper = shallowMount(AddToCartForm, options);
-    wrapper.setData({
-      me: {
-        activeCart: {},
-      },
-    });
-
-    await wrapper.vm.submit();
-    expect(options.methods.createCart).not.toHaveBeenCalled();
-    expect(options.methods.updateMyCart).toHaveBeenCalled();
+    await wrapper.vm.addLineItem();
+    expect(options.methods.createMyCart).not.toBeCalled();
+    expect(options.methods.updateMyCart).toBeCalled();
+    expect(actions.openMiniCart).toBeCalled();
   });
 });
diff --git a/tests/unit/specs/components/userprofile/EditProfileForm.spec.js b/tests/unit/specs/components/userprofile/EditProfileForm.spec.js
index 1a0575c5..1b3b1a81 100644
--- a/tests/unit/specs/components/userprofile/EditProfileForm.spec.js
+++ b/tests/unit/specs/components/userprofile/EditProfileForm.spec.js
@@ -1,25 +1,10 @@
 import Vuelidate from 'vuelidate';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import { ApolloError } from 'apollo-client';
 import EditProfileForm from '@/components/useraccount/userdetail/EditProfileForm.vue';
-import ServerError from '@/components/common/ServerError.vue';
-import ValidationError from '@/components/common/ValidationError.vue';
 
 const localVue = createLocalVue();
 localVue.use(Vuelidate);
 
-function setInputValue(input, value) {
-  input.setValue(value);
-  input.trigger('change');
-  input.trigger('blur');
-}
-
-function fillForm(wrapper, customer) {
-  setInputValue(wrapper.find('[data-test="edit-profile-form-firstname"]'), customer.firstName);
-  setInputValue(wrapper.find('[data-test="edit-profile-form-lastname"]'), customer.lastName);
-  setInputValue(wrapper.find('[data-test="edit-profile-form-email"]'), customer.email);
-}
-
 describe('EditProfileForm.vue', () => {
   const me = {
     customer: {
@@ -41,9 +26,6 @@ describe('EditProfileForm.vue', () => {
     options = {
       localVue,
       mocks: { $t: jest.fn() },
-      methods: {
-        updateMyCustomer: jest.fn(),
-      },
     };
   });
 
@@ -54,71 +36,22 @@ describe('EditProfileForm.vue', () => {
   it('displays current form values', () => {
     const wrapper = shallowMount(EditProfileForm, options);
     wrapper.setData({ me });
-    expect(wrapper.find('[data-test="edit-profile-form-firstname"]').element.value).toBe(me.customer.firstName);
-    expect(wrapper.find('[data-test="edit-profile-form-lastname"]').element.value).toBe(me.customer.lastName);
-    expect(wrapper.find('[data-test="edit-profile-form-email"]').element.value).toBe(me.customer.email);
-  });
-
-  it('updates user info when one form field is valid', () => {
-    const wrapper = shallowMount(EditProfileForm, options);
-    wrapper.setData({ me });
-    setInputValue(wrapper.find('[data-test="edit-profile-form-firstname"]'), newUser.firstName);
-    wrapper.vm.submit();
-    expect(options.methods.updateMyCustomer).toHaveBeenCalled();
-  });
-
-  it('updates user info when form is valid', () => {
-    const wrapper = shallowMount(EditProfileForm, options);
-    wrapper.setData({ me });
-    fillForm(wrapper, newUser);
-    wrapper.vm.submit();
-    expect(options.methods.updateMyCustomer).toHaveBeenCalled();
-  });
-
-  it('does not update customer info when form is invalid', () => {
-    const wrapper = shallowMount(EditProfileForm, options);
-    wrapper.setData({ me });
-    setInputValue(wrapper.find('[data-test="edit-profile-form-firstname"]'), '');
-    wrapper.vm.submit();
-    expect(options.methods.updateMyCustomer).not.toHaveBeenCalled();
-  });
-
-  it('does not update customer info when form has not changed', () => {
-    const wrapper = shallowMount(EditProfileForm, options);
-    wrapper.setData({ me });
-    wrapper.vm.submit();
-    expect(options.methods.updateMyCustomer).not.toHaveBeenCalled();
-  });
-
-  it('checks if any of form values have changed', () => {
-    const wrapper = shallowMount(EditProfileForm, options);
-    wrapper.setData({ me });
-    expect(wrapper.vm.hasFormChanged).toBeFalsy();
-
-    setInputValue(wrapper.find('[data-test="edit-profile-form-email"]'), newUser.email);
-    expect(wrapper.vm.hasFormChanged).toBeTruthy();
-
-    setInputValue(wrapper.find('[data-test="edit-profile-form-email"]'), me.customer.email);
-    expect(wrapper.vm.hasFormChanged).toBeFalsy();
-  });
-
-  it('shows form error', () => {
-    const wrapper = shallowMount(EditProfileForm, options);
-    wrapper.setData({ me });
-    expect(wrapper.findAll(ValidationError).length).toBe(3);
+    wrapper.find('[data-test="edit-profile-form-show"]').trigger('click');
+    expect(wrapper.vm.form.firstName).toBe(me.customer.firstName);
+    expect(wrapper.vm.form.lastName).toBe(me.customer.lastName);
+    expect(wrapper.vm.form.email).toBe(me.customer.email);
   });
 
-  it('catches server errors', async () => {
+  it('re-opens form with initially stored values', () => {
     const wrapper = shallowMount(EditProfileForm, options);
     wrapper.setData({ me });
-    expect(wrapper.find(ServerError).props().error).toBeNull();
+    wrapper.find('[data-test="edit-profile-form-show"]').trigger('click');
+    wrapper.setData({ form: { ...newUser } });
 
-    const error = new ApolloError({
-      graphQLErrors: [{ code: 'Error1' }, { code: 'Error2' }],
-    });
-    options.methods.updateMyCustomer.mockRejectedValue(error);
-    fillForm(wrapper, newUser);
-    await wrapper.vm.submit();
-    expect(wrapper.find(ServerError).props().error).toEqual(error);
+    wrapper.find('[data-test="edit-profile-form-cancel"]').trigger('click');
+    wrapper.find('[data-test="edit-profile-form-show"]').trigger('click');
+    expect(wrapper.vm.form.firstName).toBe(me.customer.firstName);
+    expect(wrapper.vm.form.lastName).toBe(me.customer.lastName);
+    expect(wrapper.vm.form.email).toBe(me.customer.email);
   });
 });
diff --git a/tests/unit/specs/components/userprofile/myOrders.spec.js b/tests/unit/specs/components/userprofile/TabOrderList.spec.js
similarity index 100%
rename from tests/unit/specs/components/userprofile/myOrders.spec.js
rename to tests/unit/specs/components/userprofile/TabOrderList.spec.js
diff --git a/tests/unit/specs/mixin/cartMixin.spec.js b/tests/unit/specs/mixin/cartMixin.spec.js
index ce7f82de..09bf9c6b 100644
--- a/tests/unit/specs/mixin/cartMixin.spec.js
+++ b/tests/unit/specs/mixin/cartMixin.spec.js
@@ -1,43 +1,73 @@
 import cartMixin from '@/mixins/cartMixin';
 
 describe('cartMixin', () => {
+  const noCart = { me: {} };
+  const emptyCart = { me: { activeCart: { lineItems: [] } } };
+
+  it('decides whether cart exists', () => {
+    delete cartMixin.computed.me;
+    expect(cartMixin.computed.cartExists()).toBeFalsy();
+
+    Object.assign(cartMixin.computed, noCart);
+    expect(cartMixin.computed.cartExists()).toBeFalsy();
+
+    Object.assign(cartMixin.computed, emptyCart);
+    expect(cartMixin.computed.cartExists()).toBeTruthy();
+  });
+
+  it('decides whether cart is empty', () => {
+    delete cartMixin.computed.me;
+    expect(cartMixin.computed.cartNotEmpty()).toBeFalsy();
+
+    Object.assign(cartMixin.computed, noCart);
+    expect(cartMixin.computed.cartNotEmpty()).toBeFalsy();
+
+    Object.assign(cartMixin.computed, emptyCart);
+    expect(cartMixin.computed.cartNotEmpty()).toBeFalsy();
+
+    const cartWithItems = { me: { activeCart: { lineItems: [{}] } } };
+    Object.assign(cartMixin.computed, cartWithItems);
+    expect(cartMixin.computed.cartNotEmpty()).toBeTruthy();
+  });
+
   it('calculates total items', () => {
+    delete cartMixin.computed.me;
     expect(cartMixin.computed.totalItems()).toBe(0);
 
-    Object.assign(cartMixin.computed,
-      {
-        me: {},
-      });
+    Object.assign(cartMixin.computed, noCart);
     expect(cartMixin.computed.totalItems()).toBe(0);
 
-    Object.assign(cartMixin.computed,
-      {
-        me: {
-          activeCart: {
-            lineItems: [],
-          },
-        },
-      });
+    Object.assign(cartMixin.computed, emptyCart);
     expect(cartMixin.computed.totalItems()).toBe(0);
 
-    Object.assign(cartMixin.computed,
-      {
-        me: {
-          activeCart: {
-            lineItems: [{ quantity: 4 }],
-          },
-        },
-      });
+    const cartWithItems = { me: { activeCart: { lineItems: [] } } };
+    cartWithItems.me.activeCart.lineItems.push({ quantity: 4 });
+    Object.assign(cartMixin.computed, cartWithItems);
     expect(cartMixin.computed.totalItems()).toBe(4);
 
-    Object.assign(cartMixin.computed,
-      {
-        me: {
-          activeCart: {
-            lineItems: [{ quantity: 4 }, { quantity: 6 }, { quantity: 2 }],
-          },
-        },
-      });
+    cartWithItems.me.activeCart.lineItems.push({ quantity: 6 });
+    cartWithItems.me.activeCart.lineItems.push({ quantity: 2 });
+    Object.assign(cartMixin.computed, cartWithItems);
     expect(cartMixin.computed.totalItems()).toBe(12);
   });
+
+  it('sorts line items', () => {
+    delete cartMixin.computed.me;
+    Object.assign(cartMixin.computed, noCart);
+    expect(cartMixin.computed.sortedLineItems()).toEqual([]);
+
+    const cartWithItems = { me: { activeCart: { lineItems: [] } } };
+    cartWithItems.me.activeCart.lineItems.push({ id: 'id1' });
+    Object.assign(cartMixin.computed, cartWithItems);
+    expect(cartMixin.computed.sortedLineItems()).toEqual([{ id: 'id1' }]);
+
+    cartWithItems.me.activeCart.lineItems.push({ id: 'id2' });
+    cartWithItems.me.activeCart.lineItems.push({ id: 'id3' });
+    Object.assign(cartMixin.computed, cartWithItems);
+    expect(cartMixin.computed.sortedLineItems()).toEqual([
+      { id: 'id3' },
+      { id: 'id2' },
+      { id: 'id1' },
+    ]);
+  });
 });

From a8fcc46d040dcca613625c9001d80ff23df21f21 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 2 Jul 2019 18:23:02 +0200
Subject: [PATCH 15/69] Use BaseInput in add discount code and fix style

---
 src/assets/scss/_cart.scss                    | 13 ++--
 src/assets/scss/_checkout-shipping.scss       |  9 ++-
 .../cartdetail/AddDiscountCodeForm.vue        | 66 ++++++++++++-------
 src/components/checkout/CartOverview.vue      |  8 ++-
 .../checkout/StepShippingAddressForm.vue      |  3 +-
 .../common/cartlike/CartLikePriceDetail.vue   |  7 ++
 .../common/cartlike/CartLikeSummary.vue       | 62 ++++++++---------
 src/components/common/form/BaseInput.vue      | 12 +++-
 src/components/common/form/BaseLabel.vue      | 14 +++-
 .../common/form/ValidationError.vue           | 29 ++++----
 src/components/login/SignUpForm.vue           | 12 ++++
 11 files changed, 152 insertions(+), 83 deletions(-)

diff --git a/src/assets/scss/_cart.scss b/src/assets/scss/_cart.scss
index 2ca1541a..daac3a7e 100755
--- a/src/assets/scss/_cart.scss
+++ b/src/assets/scss/_cart.scss
@@ -70,6 +70,7 @@
 .cart-content {
   background: $white;
   border: 1px solid $alto;
+  padding: 0 1em;
 }
 .cart-items-title {
   margin: 1em 1em 0;
@@ -125,13 +126,13 @@
   margin-right: 0.5em;
 }
 
-.cart-content .single-cart-item {
-  margin: 0 1em;
-}
-
 .single-cart-item {
-  padding: 1em;
+  margin: 1em;
   border-bottom: 1px solid $alto;
+
+  &:last-child {
+    border-bottom: 0;
+  }
 }
 
 // Quantity counter / spinner
@@ -219,7 +220,7 @@
 
 // Total price section
 .total-price-calc {
-  margin: 1em;
+  padding: 1em;
   font-size: 1.1em;
   letter-spacing: 0.1em;
 }
diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
index b9fee8dd..79e6852c 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -216,10 +216,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;
diff --git a/src/components/cartdetail/AddDiscountCodeForm.vue b/src/components/cartdetail/AddDiscountCodeForm.vue
index 02fa846c..74dcc56d 100644
--- a/src/components/cartdetail/AddDiscountCodeForm.vue
+++ b/src/components/cartdetail/AddDiscountCodeForm.vue
@@ -1,26 +1,19 @@
 <template>
-  <form @submit.prevent="submit(addDiscountCode)"
-        class="text-right promotion-info">
-    <div class="row">
+  <form @submit.prevent="submit(addDiscountCode)">
+    <div class="text-right add-discount-code-form">
       <ServerError :error="serverError"
                    v-slot="{ graphQLError }"
                    class="server-error">
         {{ getErrorMessage(graphQLError) }}
       </ServerError>
-      <span class="text-uppercase promo-info-text">
-        {{ $t('code') }}
-        <img src="../../assets/img/information.png"
-             class="info-icon"
-             alt="information icon">
-      </span>
       <BaseInput v-model="form.code"
                  :vuelidate="$v.form.code"
+                 :label="$t('code')"
                  type="text"
                  id="promo-code"
-                 class="vuelidate"
                  data-test="discount-code-input"/>
       <LoadingButton :buttonState="buttonState"
-                     class="apply-button"
+                     class="submit-button"
                      data-test="apply-discount-code-button">
         {{ $t('apply') }}
       </LoadingButton>
@@ -76,24 +69,47 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-.apply-button {
-  background: none;
-  font-weight: normal;
-  font-size: 14px;
-  border: 2px solid #D6D6D6;
-  color: #ADADAD;
-  padding: 0.5em 1em;
+<style lang="scss">
+.add-discount-code-form {
+  border-top: 1px solid #D6D6D6;
+  padding: 1em;
 
-  &:hover {
+  label {
+    display: inline;
+
+    .text {
+      color: #858585;
+      letter-spacing: 0.1em;
+      margin-right: 1em;
+    }
+  }
+
+  .form-error-message {
+    display: none;
+  }
+
+  .field-required {
+    display: none;
+  }
+
+  .submit-button {
     background: none;
-    color: #858585;
-    border: 2px solid #858585;
+    font-weight: normal;
+    font-size: 14px;
+    border: 2px solid #D6D6D6;
+    color: #ADADAD;
+    padding: 0.5em 1em;
+
+    &:hover {
+      background: none;
+      color: #858585;
+      border: 2px solid #858585;
+    }
   }
-}
 
-.server-error {
-  margin: 1em;
+  .server-error {
+    margin: 1em;
+  }
 }
 </style>
 
diff --git a/src/components/checkout/CartOverview.vue b/src/components/checkout/CartOverview.vue
index de41817f..22ce31b1 100644
--- a/src/components/checkout/CartOverview.vue
+++ b/src/components/checkout/CartOverview.vue
@@ -13,7 +13,7 @@
                :key="lineItem.id"
                class="order-summary-item">
             <LineItemInfo :line-item="lineItem"
-                          class="col-sm-12"/>
+                          class="line-item-info"/>
             <div class="order-item-price">
               <div class="row">
                 <div class="col-xs-4">
@@ -148,6 +148,12 @@ export default {
 };
 </script>
 
+<style lang="scss" scoped>
+.line-item-info {
+  float: left;
+}
+</style>
+
 <i18n>
   en:
     itemsTotal: "{n} item in total | {n} items in total"
diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index 09daa505..55d63d99 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -11,8 +11,7 @@
                      :vuelidate="$v.form.firstName"
                      :label="$t('firstName')"
                      type="text"
-                     autocomplete="fname"
-                     class="checkout-input-field"/>
+                     autocomplete="fname"/>
         </div>
         <div class="col-sm-6">
           <BaseInput v-model="form.lastName"
diff --git a/src/components/common/cartlike/CartLikePriceDetail.vue b/src/components/common/cartlike/CartLikePriceDetail.vue
index d196a188..63c3855a 100644
--- a/src/components/common/cartlike/CartLikePriceDetail.vue
+++ b/src/components/common/cartlike/CartLikePriceDetail.vue
@@ -112,6 +112,13 @@ export default {
 };
 </script>
 
+<style scoped>
+.cart-like-price-detail {
+  border-top: 1px solid #D6D6D6;
+  padding: 1em;
+}
+</style>
+
 <i18n>
 en:
   subtotal: "Subtotal"
diff --git a/src/components/common/cartlike/CartLikeSummary.vue b/src/components/common/cartlike/CartLikeSummary.vue
index dc82f8f2..8fbb5a01 100644
--- a/src/components/common/cartlike/CartLikeSummary.vue
+++ b/src/components/common/cartlike/CartLikeSummary.vue
@@ -16,37 +16,39 @@
         </div>
       </div>
     </div>
-    <div v-for="lineItem in cartLike.lineItems"
-         :key="lineItem.id"
-         data-test="cart-line-item"
-         class="row single-cart-item">
-      <LineItemInfo :line-item="lineItem"
-                    class="col-sm-4 col-xs-12"/>
-      <div class="col-sm-4 col-xs-12">
-        <slot name="quantity-column"
-              :lineItem="lineItem">
-          <div class="col-sm-6 col-sm-offset-6 col-xs-12 text-center quantity-counter">
-            <span class="visible-xs">{{ $t('quantity') }}:</span>
-            <span data-test="cart-line-item-quantity"
-                  class="quantity-number">
-              {{ lineItem.quantity }}
-            </span>
-          </div>
-        </slot>
-      </div>
-      <div>
-        <div class="col-sm-2 col-xs-12 sm-pull-right">
-          <div class="text-right cart-item-price">
-            <span class="visible-xs xs-price-title">{{ $t('price') }}</span>
-            <BasePrice :price="lineItem.price"/>
-          </div>
+    <div class="row">
+      <div v-for="lineItem in cartLike.lineItems"
+           :key="lineItem.id"
+           data-test="cart-line-item"
+           class="row single-cart-item">
+        <LineItemInfo :line-item="lineItem"
+                      class="col-sm-4 col-xs-12"/>
+        <div class="col-sm-4 col-xs-12">
+          <slot name="quantity-column"
+                :lineItem="lineItem">
+            <div class="col-sm-6 col-sm-offset-6 col-xs-12 text-center quantity-counter">
+              <span class="visible-xs">{{ $t('quantity') }}:</span>
+              <span data-test="cart-line-item-quantity"
+                    class="quantity-number">
+                {{ lineItem.quantity }}
+              </span>
+            </div>
+          </slot>
         </div>
-        <div class="col-sm-2 col-xs-12 sm-pull-right">
-          <div class="text-right cart-item-price">
-            <span class="visible-xs xs-price-title">{{ $t('total') }}</span>
-            <span data-test="cart-line-item-total-price">
-              <BaseMoney :money="lineItem.totalPrice"/>
-            </span>
+        <div>
+          <div class="col-sm-2 col-xs-12 sm-pull-right">
+            <div class="text-right cart-item-price">
+              <span class="visible-xs xs-price-title">{{ $t('price') }}</span>
+              <BasePrice :price="lineItem.price"/>
+            </div>
+          </div>
+          <div class="col-sm-2 col-xs-12 sm-pull-right">
+            <div class="text-right cart-item-price">
+              <span class="visible-xs xs-price-title">{{ $t('total') }}</span>
+              <span data-test="cart-line-item-total-price">
+                <BaseMoney :money="lineItem.totalPrice"/>
+              </span>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/components/common/form/BaseInput.vue b/src/components/common/form/BaseInput.vue
index 9a93f502..c3db0c15 100644
--- a/src/components/common/form/BaseInput.vue
+++ b/src/components/common/form/BaseInput.vue
@@ -2,7 +2,8 @@
   <span class="form-field">
     <BaseLabel v-if="label"
                :vuelidate="vuelidate"
-               :label="label">
+               :label="label"
+               :type="$attrs.type">
       <input v-model="model"
              v-bind="$attrs"
              :class="{ 'error': vuelidate.$error }"/>
@@ -62,6 +63,15 @@ export default {
 <style scoped>
 .form-field {
   width: 100%;
+  position: relative;
+}
+
+input {
+  width: 100%;
+  border: 1px solid #D6D6D6;
+  border-radius: 1px;
+  padding: 0.5em;
+  margin-top: 0.2em;
 }
 
 .error {
diff --git a/src/components/common/form/BaseLabel.vue b/src/components/common/form/BaseLabel.vue
index 340742f4..f5c0efdd 100644
--- a/src/components/common/form/BaseLabel.vue
+++ b/src/components/common/form/BaseLabel.vue
@@ -1,5 +1,6 @@
 <template>
   <label class="field-label">
+    <slot v-if="checkbox"></slot>
     <span class="text">{{ label }}</span>
     <span v-if="required"
           :title="$t('required')"
@@ -7,7 +8,7 @@
           data-test="form-label-required">
       *
     </span>
-    <slot></slot>
+    <slot v-if="!checkbox"></slot>
   </label>
 </template>
 
@@ -22,12 +23,19 @@ export default {
       type: String,
       required: true,
     },
+    type: {
+      type: String,
+    },
   },
 
   computed: {
     required() {
       return this.vuelidate.$params?.required;
     },
+
+    checkbox() {
+      return this.type === 'checkbox';
+    },
   },
 };
 </script>
@@ -36,10 +44,12 @@ export default {
 label {
   width: 100%;
   padding-top: 15px;
+  position: relative;
 }
 
 label .text {
-  text-transform: uppercase
+  text-transform: uppercase;
+  font-weight: 400;
 }
 
 .field-required {
diff --git a/src/components/common/form/ValidationError.vue b/src/components/common/form/ValidationError.vue
index e083ce8e..14e216a1 100644
--- a/src/components/common/form/ValidationError.vue
+++ b/src/components/common/form/ValidationError.vue
@@ -1,17 +1,17 @@
 <template>
-  <div v-if="vuelidate.$error"
-       data-test="validation-error-list">
-    <div v-for="validation in validations"
-         :key="validation">
-      <div v-if="!vuelidate[validation]"
-           :validation="validation"
-           data-test="validation-error">
-        <div class="form-error-bubble">
+  <span v-if="vuelidate.$error"
+        data-test="validation-error-list">
+    <span v-for="validation in validations"
+          :key="validation">
+      <span v-if="!vuelidate[validation]"
+            :validation="validation"
+            data-test="validation-error">
+        <span class="form-error-message">
           {{ getErrorMessage(validation) }}
-        </div>
-      </div>
-    </div>
-  </div>
+        </span>
+      </span>
+    </span>
+  </span>
 </template>
 
 <script>
@@ -47,14 +47,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.form-error-bubble {
+.form-error-message {
   font-size: 12px;
   position: absolute;
-  margin-top: -7px;
   margin-left: 1px;
   z-index: 1000;
   padding: 0;
   color: rgb(206, 65, 65);
+  left: 0;
+  bottom: -10px;
 }
 </style>
 
diff --git a/src/components/login/SignUpForm.vue b/src/components/login/SignUpForm.vue
index e0d83f22..abba1987 100644
--- a/src/components/login/SignUpForm.vue
+++ b/src/components/login/SignUpForm.vue
@@ -165,6 +165,18 @@ export default {
 };
 </script>
 
+<style lang="scss">
+.signup-box-terms {
+  input {
+    width: auto;
+    margin-top: 0.3em;
+  }
+  .form-error-message {
+    bottom: -15px;
+  }
+}
+</style>
+
 <i18n>
 en:
   title: "New Customer Registration"

From 12a9563044c19a9fef3a8997889f1428381373af Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 2 Jul 2019 18:24:30 +0200
Subject: [PATCH 16/69] Reduce margin from server error in add discount code

---
 src/components/cartdetail/AddDiscountCodeForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/cartdetail/AddDiscountCodeForm.vue b/src/components/cartdetail/AddDiscountCodeForm.vue
index 74dcc56d..d71b111d 100644
--- a/src/components/cartdetail/AddDiscountCodeForm.vue
+++ b/src/components/cartdetail/AddDiscountCodeForm.vue
@@ -108,7 +108,7 @@ export default {
   }
 
   .server-error {
-    margin: 1em;
+    margin: 0.5em 1em;
   }
 }
 </style>

From 201dce3d1412722bfc21296cf709b07076d0b61d Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 3 Jul 2019 11:07:34 +0200
Subject: [PATCH 17/69] Improve aesthetics order overview

---
 src/assets/scss/_checkout-shipping.scss  | 2 +-
 src/assets/scss/_navigation.scss         | 2 +-
 src/components/checkout/CartOverview.vue | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
index 79e6852c..93555234 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -188,7 +188,7 @@
   }
 
   .product-img-col {
-    padding: 0.5em;
+    padding-bottom: 1em;
     img {
       border: 1px solid $alto;
     }
diff --git a/src/assets/scss/_navigation.scss b/src/assets/scss/_navigation.scss
index 09cee335..c0a6031f 100755
--- a/src/assets/scss/_navigation.scss
+++ b/src/assets/scss/_navigation.scss
@@ -508,7 +508,7 @@
           margin: 0;
           font-size: 1.1em;
           line-height: 1.2em;
-          width: 70%;
+          width: 90%;
         }
       }
 
diff --git a/src/components/checkout/CartOverview.vue b/src/components/checkout/CartOverview.vue
index 22ce31b1..c55e5244 100644
--- a/src/components/checkout/CartOverview.vue
+++ b/src/components/checkout/CartOverview.vue
@@ -16,7 +16,7 @@
                           class="line-item-info"/>
             <div class="order-item-price">
               <div class="row">
-                <div class="col-xs-4">
+                <div class="col-xs-3">
                   <div class="text-right">
                     <span class="text-uppercase pricing-titles">{{ $t("quantity") }}</span>
                     <br>
@@ -30,7 +30,7 @@
                     <BasePrice :price="lineItem.price"/>
                   </div>
                 </div>
-                <div class="col-xs-4">
+                <div class="col-xs-5">
                   <div class="text-right order-item-value">
                     <span class="text-uppercase pricing-titles">{{ $t("total") }}</span>
                     <br>

From 5a27072989bfb433443d2192451816b70e8fe55a Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 3 Jul 2019 19:55:48 +0200
Subject: [PATCH 18/69] Refresh token when 401

---
 package.json  |  2 ++
 src/apollo.js | 17 +++++++++++++--
 src/auth.js   |  3 ++-
 yarn.lock     | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 08d30b89..529993e9 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,9 @@
     "@commercetools/sdk-auth": "^1.5.0",
     "apollo-cache-inmemory": "^1.3.5",
     "apollo-client": "^2.4.12",
+    "apollo-link": "^1.2.12",
     "apollo-link-context": "^1.0.8",
+    "apollo-link-error": "^1.1.11",
     "babel-loader": "^8.0.2",
     "graphql-tag": "^2.9.0",
     "lodash.debounce": "^4.0.8",
diff --git a/src/apollo.js b/src/apollo.js
index e2ba0590..2b3b306c 100644
--- a/src/apollo.js
+++ b/src/apollo.js
@@ -2,7 +2,9 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory';
 import { setContext } from 'apollo-link-context';
-import { getAuthToken } from '@/auth';
+import { onError } from 'apollo-link-error';
+import { fromPromise } from 'apollo-link';
+import { getAuthToken, cleanUpSession } from '@/auth';
 import { createApolloClient } from 'vue-cli-plugin-apollo/graphql-client';
 import config from '@/../sunrise.config';
 import introspectionQueryResultData from '@/../graphql-fragments.json';
@@ -14,13 +16,24 @@ function createClient() {
   const authLink = setContext((_, { headers = {} }) => getAuthToken()
     .then(authorization => ({ headers: { ...headers, authorization } })));
 
+  const errorLink = onError(({ networkError, operation, forward }) => {
+    if (networkError?.statusCode === 401) {
+      const { headers } = operation.getContext();
+      return fromPromise(cleanUpSession().then(getAuthToken)).flatMap((authorization) => {
+        operation.setContext({ headers: { ...headers, authorization } });
+        return forward(operation);
+      });
+    }
+    return null;
+  });
+
   // Matcher for fragments on unions and interfaces
   const fragmentMatcher = new IntrospectionFragmentMatcher({ introspectionQueryResultData });
 
   const { apolloClient, wsClient } = createApolloClient({
     httpEndpoint: process.env.VUE_APP_GRAPHQL_HTTP || `${config.ct.api.host}/${config.ct.auth.projectKey}/graphql`,
     cache: new InMemoryCache({ fragmentMatcher }),
-    link: authLink,
+    link: authLink.concat(errorLink),
   });
 
   apolloClient.wsClient = wsClient;
diff --git a/src/auth.js b/src/auth.js
index 087d4e44..109ec604 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -24,7 +24,8 @@ const tokenProvider = new TokenProvider({
   onTokenInfoChanged: tokenInfo => localStorage.setItem(tokenInfoStorageName, JSON.stringify(tokenInfo)),
 }, storedTokenInfo);
 
-function cleanUpSession() {
+export function cleanUpSession() {
+  tokenProvider.invalidateTokenInfo();
   localStorage.removeItem(tokenInfoStorageName);
   localStorage.removeItem(isAuthenticatedStorageName);
   return store.dispatch('setAuthenticated', false);
diff --git a/yarn.lock b/yarn.lock
index 55dd6e58..185f9a1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1472,6 +1472,13 @@
     "@webassemblyjs/wast-parser" "1.7.11"
     "@xtuc/long" "4.2.1"
 
+"@wry/equality@^0.1.2":
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.9.tgz#b13e18b7a8053c6858aa6c85b54911fb31e3a909"
+  integrity sha512-mB6ceGjpMGz1ZTza8HYnrPGos2mC6So4NhS1PtZ8s4Qt0K7fBiIGhpSxUbQmhwcSWE3no+bYxmI2OL6KuXYmoQ==
+  dependencies:
+    tslib "^1.9.3"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -1757,6 +1764,24 @@ apollo-link-dedup@^1.0.0:
   dependencies:
     apollo-link "^1.2.8"
 
+apollo-link-error@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.11.tgz#7cd363179616fb90da7866cee85cb00ee45d2f3b"
+  integrity sha512-442DNqn3CNRikDaenMMkoDmCRmkoUx/XyUMlRTZBEFdTw3FYPQLsmDO3hzzC4doY5/BHcn9/jdYh9EeLx4HPsA==
+  dependencies:
+    apollo-link "^1.2.12"
+    apollo-link-http-common "^0.2.14"
+    tslib "^1.9.3"
+
+apollo-link-http-common@^0.2.14:
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.14.tgz#d3a195c12e00f4e311c417f121181dcc31f7d0c8"
+  integrity sha512-v6mRU1oN6XuX8beVIRB6OpF4q1ULhSnmy7ScnHnuo1qV6GaFmDcbdvXqxIkAV1Q8SQCo2lsv4HeqJOWhFfApOg==
+  dependencies:
+    apollo-link "^1.2.12"
+    ts-invariant "^0.4.0"
+    tslib "^1.9.3"
+
 apollo-link-http-common@^0.2.5:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.10.tgz#b5bbf502ff40a81cc00281ba3b8543b7ad866dfe"
@@ -1794,6 +1819,16 @@ apollo-link@^1.0.0, apollo-link@^1.2.1, apollo-link@^1.2.3, apollo-link@^1.2.8:
   dependencies:
     zen-observable-ts "^0.8.15"
 
+apollo-link@^1.2.12:
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.12.tgz#014b514fba95f1945c38ad4c216f31bcfee68429"
+  integrity sha512-fsgIAXPKThyMVEMWQsUN22AoQI+J/pVXcjRGAShtk97h7D8O+SPskFinCGEkxPeQpE83uKaqafB2IyWdjN+J3Q==
+  dependencies:
+    apollo-utilities "^1.3.0"
+    ts-invariant "^0.4.0"
+    tslib "^1.9.3"
+    zen-observable-ts "^0.8.19"
+
 apollo-server-caching@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.3.1.tgz#63fcb2aaa176e1e101b36a8450e6b4c593d2767a"
@@ -1889,6 +1924,16 @@ apollo-utilities@1.2.1, apollo-utilities@^1.0.1, apollo-utilities@^1.0.25, apoll
     ts-invariant "^0.2.1"
     tslib "^1.9.3"
 
+apollo-utilities@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
+  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
+  dependencies:
+    "@wry/equality" "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    ts-invariant "^0.4.0"
+    tslib "^1.9.3"
+
 append-transform@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
@@ -11594,6 +11639,13 @@ ts-invariant@^0.2.1:
   dependencies:
     tslib "^1.9.3"
 
+ts-invariant@^0.4.0:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86"
+  integrity sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==
+  dependencies:
+    tslib "^1.9.3"
+
 ts-node@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.1.tgz#9562dc2d1e6d248d24bc55f773e3f614337d9baf"
@@ -12703,6 +12755,14 @@ zen-observable-ts@^0.8.15:
   dependencies:
     zen-observable "^0.8.0"
 
+zen-observable-ts@^0.8.19:
+  version "0.8.19"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.19.tgz#c094cd20e83ddb02a11144a6e2a89706946b5694"
+  integrity sha512-u1a2rpE13G+jSzrg3aiCqXU5tN2kw41b+cBZGmnc+30YimdkKiDj9bTowcB41eL77/17RF/h+393AuVgShyheQ==
+  dependencies:
+    tslib "^1.9.3"
+    zen-observable "^0.8.0"
+
 zen-observable@^0.8.0:
   version "0.8.13"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.13.tgz#a9f1b9dbdfd2d60a08761ceac6a861427d44ae2e"

From 135e6e497f34770533a5b57675b1b5b810be5369 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 3 Jul 2019 19:57:03 +0200
Subject: [PATCH 19/69] Fix location selector style on small devices

---
 src/assets/scss/_megamenu.scss   | 2 +-
 src/assets/scss/_navigation.scss | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/assets/scss/_megamenu.scss b/src/assets/scss/_megamenu.scss
index e3e43191..a289d439 100755
--- a/src/assets/scss/_megamenu.scss
+++ b/src/assets/scss/_megamenu.scss
@@ -333,7 +333,7 @@
           background: $ebony-clay url("../img/arrow-67-white.png") no-repeat 90% 50%;
           background-size: 10px;
           padding-right: 30px;
-          text-transform: capitalize;
+          text-transform: uppercase;
         }
       }
     }
diff --git a/src/assets/scss/_navigation.scss b/src/assets/scss/_navigation.scss
index c0a6031f..e52d7df3 100755
--- a/src/assets/scss/_navigation.scss
+++ b/src/assets/scss/_navigation.scss
@@ -224,6 +224,7 @@
       padding-bottom: 10px;
       width: 180px;
       top: -2px;
+      text-align: left;
       .location-select {
         width: 120px;
         color: $white;
@@ -231,7 +232,11 @@
         background: transparent url("../img/arrow-67-white.png") no-repeat 90% 50%;
         background-size: 10px;
         margin: 10px;
-        text-transform: capitalize;
+        text-transform: uppercase;
+      }
+      li {
+        text-align: left;
+        width: 100%;
       }
     }
     li {

From 134028252d159e137ea95cf106012f792a4e2c32 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 9 Jul 2019 17:56:41 +0200
Subject: [PATCH 20/69] Improve sunrise configuration file and adapt it for
 scopes

---
 netlify.toml      |  1 +
 src/apollo.js     | 22 ++++++++++------------
 src/auth.js       |  6 +++---
 src/i18n/i18n.js  |  2 +-
 src/main.js       | 17 ++++++++---------
 sunrise.config.js | 38 ++++++++++++--------------------------
 6 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index 65ffd062..ec6f676e 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -6,6 +6,7 @@
   VUE_APP_CT_PROJECT_KEY = "Your project key (optional)"
   VUE_APP_CT_CLIENT_ID = "Your client ID (optional)"
   VUE_APP_CT_CLIENT_SECRET = "Your client secret (optional)"
+  VUE_APP_CT_SCOPE = "Your client scope (optional)"
   VUE_APP_CT_AUTH_HOST = "Auth host (default Europe)"
   VUE_APP_CT_API_HOST = "API host (default Europe)"
   YARN_FLAGS = "--no-ignore-optional"
diff --git a/src/apollo.js b/src/apollo.js
index 2b3b306c..3f733fe6 100644
--- a/src/apollo.js
+++ b/src/apollo.js
@@ -4,10 +4,10 @@ import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemo
 import { setContext } from 'apollo-link-context';
 import { onError } from 'apollo-link-error';
 import { fromPromise } from 'apollo-link';
-import { getAuthToken, cleanUpSession } from '@/auth';
 import { createApolloClient } from 'vue-cli-plugin-apollo/graphql-client';
-import config from '@/../sunrise.config';
-import introspectionQueryResultData from '@/../graphql-fragments.json';
+import { getAuthToken, cleanUpSession } from './auth';
+import config from '../sunrise.config';
+import introspectionQueryResultData from '../graphql-fragments.json';
 
 // Install the vue plugin
 Vue.use(VueApollo);
@@ -17,8 +17,10 @@ function createClient() {
     .then(authorization => ({ headers: { ...headers, authorization } })));
 
   const errorLink = onError(({ networkError, operation, forward }) => {
-    if (networkError?.statusCode === 401) {
+    const statusCode = networkError?.statusCode;
+    if (statusCode === 401 || statusCode === 403) {
       const { headers } = operation.getContext();
+      console.warn('Unauthorized or forbidden connection to commercetools, cleaning up session...', networkError);
       return fromPromise(cleanUpSession().then(getAuthToken)).flatMap((authorization) => {
         operation.setContext({ headers: { ...headers, authorization } });
         return forward(operation);
@@ -30,22 +32,18 @@ function createClient() {
   // Matcher for fragments on unions and interfaces
   const fragmentMatcher = new IntrospectionFragmentMatcher({ introspectionQueryResultData });
 
-  const { apolloClient, wsClient } = createApolloClient({
-    httpEndpoint: process.env.VUE_APP_GRAPHQL_HTTP || `${config.ct.api.host}/${config.ct.auth.projectKey}/graphql`,
+  return createApolloClient({
+    httpEndpoint: process.env.VUE_APP_GRAPHQL_HTTP || `${config.ct.api}/${config.ct.auth.projectKey}/graphql`,
     cache: new InMemoryCache({ fragmentMatcher }),
     link: authLink.concat(errorLink),
-  });
-
-  apolloClient.wsClient = wsClient;
-
-  return apolloClient;
+  }).apolloClient;
 }
 
 const apolloProvider = new VueApollo({
   defaultClient: createClient(),
   errorHandler(error) {
     // eslint-disable-next-line no-console
-    console.error(error);
+    console.error('An error occurred in a request to commercetools', error);
   },
 });
 export default apolloProvider;
diff --git a/src/auth.js b/src/auth.js
index 109ec604..539973cd 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -1,7 +1,7 @@
 import SdkAuth, { TokenProvider } from '@commercetools/sdk-auth';
-import apolloProvider from '@/apollo';
-import store from '@/store';
-import config from '@/../sunrise.config';
+import apolloProvider from './apollo';
+import store from './store';
+import config from '../sunrise.config';
 
 const tokenInfoStorageName = 'token';
 const isAuthenticatedStorageName = 'auth';
diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js
index 4bdf86ec..731da695 100644
--- a/src/i18n/i18n.js
+++ b/src/i18n/i18n.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueI18n from 'vue-i18n';
-import sunriseConfig from '@/../sunrise.config';
+import sunriseConfig from '../../sunrise.config';
 
 Vue.use(VueI18n);
 
diff --git a/src/main.js b/src/main.js
index 012dae3d..8249ac7e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,17 +2,16 @@ import Vue from 'vue';
 // Required until Cypress supports fetch API
 // https://github.com/cypress-io/cypress/issues/95
 import 'whatwg-fetch';
-import App from '@/App.vue';
 import Vuelidate from 'vuelidate';
-import router from '@/router';
-import store from '@/store';
-import '@/registerServiceWorker';
-import apolloProvider from '@/apollo';
-import i18n from '@/i18n/i18n';
-import sunriseConfig from '@/../sunrise.config';
 import ProductZoomer from 'vue-product-zoomer';
-
-import '@/assets/scss/main.scss';
+import App from './App.vue';
+import router from './router';
+import store from './store';
+import apolloProvider from './apollo';
+import i18n from './i18n/i18n';
+import sunriseConfig from '../sunrise.config';
+import './registerServiceWorker';
+import './assets/scss/main.scss';
 
 Vue.config.productionTip = false;
 
diff --git a/sunrise.config.js b/sunrise.config.js
index 1c648d47..791d3922 100644
--- a/sunrise.config.js
+++ b/sunrise.config.js
@@ -1,40 +1,26 @@
-// default commercetools project credentials
-const projectKey = process.env.VUE_APP_CT_PROJECT_KEY || 'sunrise-spa';
-const clientId = process.env.VUE_APP_CT_CLIENT_ID || 'Cie7e2JpX5Z0bUzzQUkhAuZh';
-const clientSecret = process.env.VUE_APP_CT_CLIENT_SECRET || 'QhgNoWJFjKjNSf3Z3MriUulzjGH74MEj';
-
-const authHost = process.env.VUE_APP_CT_AUTH_HOST || 'https://auth.commercetools.com';
-const apiHost = process.env.VUE_APP_CT_API_HOST || 'https://api.commercetools.com';
-
-function scopes() {
-  return ['create_anonymous_token',
-    'view_products',
-    'manage_my_orders',
-    'manage_my_payments',
-    'manage_my_profile',
-    'manage_my_shopping_lists']
-    .map(scope => `${scope}:${projectKey}`);
-}
-
 export default {
   ct: {
     auth: {
-      host: authHost,
-      projectKey,
+      host: process.env.VUE_APP_CT_AUTH_HOST || 'https://auth.sphere.io',
+      projectKey: process.env.VUE_APP_CT_PROJECT_KEY || 'sunrise-spa',
       credentials: {
-        clientId,
-        clientSecret,
+        clientId: process.env.VUE_APP_CT_CLIENT_ID || 'jFVHj0-tO-THQt9evnGTJ2fD',
+        clientSecret: process.env.VUE_APP_CT_CLIENT_SECRET || 'eUQgmtanysDpYxlOePOhcFklrwa5X8Sj',
       },
-      scopes: scopes(),
-    },
-    api: {
-      host: apiHost,
+      scopes: [process.env.VUE_APP_CT_SCOPE || 'manage_my_profile:sunrise-spa create_anonymous_token:sunrise-spa'
+      + ' manage_my_payments:sunrise-spa view_products:sunrise-spa manage_my_orders:sunrise-spa'
+      + ' manage_my_shopping_lists:sunrise-spa view_project_settings:sunrise-spa'],
     },
+    api: process.env.VUE_APP_CT_API_HOST || 'https://api.sphere.io',
   },
   languages: {
     en: 'English',
     de: 'Deutsch',
   },
+  countries: {
+    DE: 'English',
+    US: 'United States',
+  },
   categories: {
     salesExternalId: '6',
   },

From 567d7d82d4b57846ba70b467fd555f2f7da9d91b Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 10 Jul 2019 18:01:49 +0200
Subject: [PATCH 21/69] Enable shipping address form

---
 src/assets/scss/_checkout-shipping.scss       |   2 +-
 .../cartdetail/AddDiscountCodeForm.vue        |   6 +
 .../cartdetail/LineItemQuantityForm.vue       |  12 +-
 src/components/checkout/CartOverview.vue      |  54 --------
 src/components/checkout/PageCheckout.vue      |  56 +++++++-
 src/components/checkout/StepAddressForm.vue   |  78 -----------
 .../checkout/StepShippingAddressForm.vue      | 122 ++++++++++--------
 src/components/common/form/BaseInput.vue      |   1 +
 src/components/common/form/BaseSelect.vue     |  16 ++-
 src/components/common/form/SelectBoxIt.vue    |   6 +
 .../userdetail/EditProfileForm.vue            |   1 +
 sunrise.config.js                             |   4 -
 12 files changed, 159 insertions(+), 199 deletions(-)
 delete mode 100644 src/components/checkout/StepAddressForm.vue

diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
index 93555234..80abf61d 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -41,7 +41,7 @@
   }
 
   .step-title {
-    padding: 0 0.5em 0 0.2em;
+    padding: 0 1em 0 0.5em;
   }
 
   .active .step-number {
diff --git a/src/components/cartdetail/AddDiscountCodeForm.vue b/src/components/cartdetail/AddDiscountCodeForm.vue
index d71b111d..27416864 100644
--- a/src/components/cartdetail/AddDiscountCodeForm.vue
+++ b/src/components/cartdetail/AddDiscountCodeForm.vue
@@ -48,6 +48,8 @@ export default {
         addDiscountCode: {
           code: this.form.code,
         },
+      }).then(() => {
+        this.form.code = null;
       });
     },
 
@@ -74,6 +76,10 @@ export default {
   border-top: 1px solid #D6D6D6;
   padding: 1em;
 
+  .form-field {
+    display: inline;
+  }
+
   label {
     display: inline;
 
diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
index cbd997f8..e5db2f8c 100644
--- a/src/components/cartdetail/LineItemQuantityForm.vue
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -83,9 +83,19 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss">
+.quantity-spinner {
   .change-quantity-button {
     margin: 1px;
     border: 0;
   }
+
+  .form-field {
+    display: inline;
+  }
+
+  .form-error-message {
+    display: none;
+  }
+}
 </style>
diff --git a/src/components/checkout/CartOverview.vue b/src/components/checkout/CartOverview.vue
index c55e5244..c85c9bd0 100644
--- a/src/components/checkout/CartOverview.vue
+++ b/src/components/checkout/CartOverview.vue
@@ -162,33 +162,6 @@ export default {
     quantity: "Quantity"
     price: "Price"
     total: "Total"
-
-    completeMyOrder: "Complete My Order"
-    continueCheckout: "Continue Checkout"
-    needHelpCustomerService: "Need help? Customer Service"
-    orderDate: "Order Date"
-    orderDiscount: "Order Discount"
-    orderNumber: "Order Number"
-    paymentInformation: "Payment Details"
-    promoCodeApplied: "Promotional Code Applied"
-    rememberMe: "Save my details to create my personal account at SUNRISE"
-    shippingInformation: "Shipping Information"
-    shippingMethod: "Shipping Method"
-    paymentPage:
-      title: "Secure Checkout - Payment"
-      cardName: "Name on credit card"
-      cardNumber: "Credit card number"
-      expiryDateTitle: "Expiry data"
-      paymentOptionsTitle: "Please provide one of the following payment options"
-      securityCode: "Security Code"
-      securityCodeTooltip: "normally you find it on the back of your card"
-    confirmationPage:
-      title: "Secure Checkout - Confirmation"
-    thankYouPage:
-      title: "Thank you for your order!"
-      emailSentToStart: "An email has been sent to"
-      emailSentToEnd: "as a copy of this confirmation purchase"
-      yourOrderDetails: "Your order details"
   de:
     itemsTotal: "{n} Artikel im Warenkorb"
     editMyCart: "Warenkorb bearbeiten"
@@ -196,31 +169,4 @@ export default {
     quantity: "Menge"
     price: "Preis"
     total: "Gesamtpreis"
-
-    completeMyOrder: "Zahlungspflichtig bestellen"
-    continueCheckout: "Weiter"
-    needHelpCustomerService: "Brauchen Sie Hilfe? Kundenservice"
-    orderDate: "Bestelldatum"
-    orderDiscount: "Bestelldiscount"
-    orderNumber: "Bestellnummer"
-    paymentInformation: "Zahlungsdetails"
-    promoCodeApplied: "Gutschein eingelöst"
-    rememberMe: "Meine Daten speichern für einen Account"
-    shippingInformation: "Versand Information"
-    shippingMethod: "Versandart"
-    paymentPage:
-      title: "Sicherer Bestellprozess - Bezahlung"
-      cardName: "Name auf der Kreditkarte"
-      cardNumber: "Kreditkartennummer"
-      expiryDateTitle: "Gültig bis"
-      paymentOptionsTitle: "Bitte wählen Sie eine Zahlungsart aus"
-      securityCode: "Prüfnummer"
-      securityCodeTooltip: "Normalerweise befindet sich der Code auf der Rückseite."
-    confirmationPage:
-      title: "Sicherer Bestellprozess - Versand"
-    thankYouPage:
-      title: "Vielen Dank für Ihre Bestellung!"
-      emailSentToStart: "Eine Email wurde versandt"
-      emailSentToEnd: "als Bestellbestätigung."
-      yourOrderDetails: "Ihre Bestelldetails"
 </i18n>
diff --git a/src/components/checkout/PageCheckout.vue b/src/components/checkout/PageCheckout.vue
index 9b306aff..7caadacd 100644
--- a/src/components/checkout/PageCheckout.vue
+++ b/src/components/checkout/PageCheckout.vue
@@ -10,7 +10,7 @@
                    :alt="$t('securePayment')">
             </span>
             <span class="text-uppercase secure-payment-title">
-              <!--{{ $t("shippingPage.title") }}-->
+              {{ $t("secureCheckout") }}
             </span>
           </div>
         </div>
@@ -18,7 +18,7 @@
           <div class="checkout-steps text-right">
             <div>
               <span class="step-number">1</span>
-              <span class="text-uppercase step-title}">{{ $t("shipping") }}</span>
+              <span class="text-uppercase step-title">{{ $t("shipping") }}</span>
             </div>
             <div>
               <span class="step-number">2</span>
@@ -65,13 +65,65 @@ export default {
 
 <i18n>
 en:
+  secureCheckout: "Secure Checkout"
   securePayment: "Secure payment"
   shipping: "Shipping"
   payment: "Payment"
   confirmation: "Confirmation"
+
+  completeMyOrder: "Complete My Order"
+  continueCheckout: "Continue Checkout"
+  needHelpCustomerService: "Need help? Customer Service"
+  orderDate: "Order Date"
+  orderDiscount: "Order Discount"
+  orderNumber: "Order Number"
+  paymentInformation: "Payment Details"
+  shippingInformation: "Shipping Information"
+  shippingMethod: "Shipping Method"
+  paymentPage:
+  cardName: "Name on credit card"
+  cardNumber: "Credit card number"
+  expiryDateTitle: "Expiry data"
+  paymentOptionsTitle: "Please provide one of the following payment options"
+  securityCode: "Security Code"
+  securityCodeTooltip: "normally you find it on the back of your card"
+  thankYouPage:
+  title: "Thank you for your order!"
+  emailSentToStart: "An email has been sent to"
+  emailSentToEnd: "as a copy of this confirmation purchase"
+  yourOrderDetails: "Your order details"
+  shippingAddress: "Shipping Address"
+  billingAddress: "Billing Address"
+  differentBillingAddressCheckboxLabel: "Use a different address for billing"
 de:
+  secureCheckout: "Sicherer Bestellprozess"
   securePayment: "Sichere Bezahlung"
   shipping: "Versand"
   payment: "Zahlung"
   confirmation: "Bestätigung"
+
+  completeMyOrder: "Zahlungspflichtig bestellen"
+  continueCheckout: "Weiter"
+  needHelpCustomerService: "Brauchen Sie Hilfe? Kundenservice"
+  orderDate: "Bestelldatum"
+  orderDiscount: "Bestelldiscount"
+  orderNumber: "Bestellnummer"
+  paymentInformation: "Zahlungsdetails"
+  shippingInformation: "Versand Information"
+  shippingMethod: "Versandart"
+  paymentPage:
+  cardName: "Name auf der Kreditkarte"
+  cardNumber: "Kreditkartennummer"
+  expiryDateTitle: "Gültig bis"
+  paymentOptionsTitle: "Bitte wählen Sie eine Zahlungsart aus"
+  securityCode: "Prüfnummer"
+  securityCodeTooltip: "Normalerweise befindet sich der Code auf der Rückseite."
+  thankYouPage:
+  title: "Vielen Dank für Ihre Bestellung!"
+  emailSentToStart: "Eine Email wurde versandt"
+  emailSentToEnd: "als Bestellbestätigung."
+  yourOrderDetails: "Ihre Bestelldetails"
+  billingAddress: "Zahlungsadresse"
+  shippingAddress: "Versandadresse"
+  differentBillingAddressCheckboxLabel: "Abweichende Adresse als Rechnungsadresse verwenden."
 </i18n>
diff --git a/src/components/checkout/StepAddressForm.vue b/src/components/checkout/StepAddressForm.vue
deleted file mode 100644
index e2a42acf..00000000
--- a/src/components/checkout/StepAddressForm.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div></div>
-    <!--<div class="row different-billing-row">-->
-      <!--<div class="col-sm-12">-->
-        <!--<div class="different-for-billing input-block">-->
-          <!--<label for="different-billing-checkbox">-->
-          <!--<span>-->
-            <!--<input id="different-billing-checkbox" type="checkbox" value="true"
-            name="billingAddressDifferentToBillingAddress"
-            {{#if addressForm.billingAddressDifferentToBillingAddress}} checked{{/if}}>-->
-          <!--</span>-->
-            <!--<span>{{ $t('checkout:shippingPage.differentBillingAddressCheckboxLabel') }}</span>-->
-          <!--</label>-->
-        <!--</div>-->
-      <!--</div>-->
-    <!--</div>-->
-    <!--<div class="row">-->
-      <!--<div class="col-sm-12">-->
-        <!--<div id="different-billing-address">-->
-          <!--<div class="row">-->
-            <!--<div class="row">-->
-              <!--<div class="col-sm-4">-->
-                <!--{{> form/choose-title containerClass="title" selectId="billing-title-select"
-                 selectName="titleBilling" options=settings.titleBilling}}-->
-              <!--</div>-->
-            <!--</div>-->
-            <!--<div class="row">-->
-              <!--{{> form/input-text columnWidth=6 name="firstNameBilling" labelKey="form.firstName"
-              required=true value=addressForm.firstNameBilling settings=settings.firstNameBilling}}-->
-              <!--{{> form/input-text columnWidth=6 name="lastNameBilling" labelKey="form.lastName"
-              required=true value=addressForm.lastNameBilling settings=settings.lastNameBilling}}-->
-              <!--{{> form/input-text columnWidth=12 name="streetNameBilling" labelKey="form.addressOne"
-               required=true value=addressForm.streetNameBilling settings=settings.streetNameBilling}}-->
-              <!--{{> form/input-text columnWidth=12 name="additionalStreetInfoBilling" labelKey="form.addressTwo"
-               required=false value=addressForm.additionalStreetInfoBilling
-               settings=settings.additionalStreetInfoBilling}}-->
-              <!--{{> form/input-text columnWidth=8 name="cityBilling" labelKey="form.city"
-              required=true value=addressForm.cityBilling settings=settings.cityBilling}}-->
-              <!--{{> form/input-text columnWidth=4 name="postalCodeBilling" labelKey="form.postCode"
-              required=true value=addressForm.postalCodeBilling settings=settings.postalCodeBilling}}-->
-              <!--<div class="col-sm-6">-->
-                <!--{{> form/choose-country containerClass="country" selectId="billing-country-select"
-                selectName="countryBilling" options=settings.countriesBilling}}-->
-              <!--</div>-->
-              <!--{{> form/input-text columnWidth=6 name="regionBilling" labelKey="form.region" required=false
-              value=addressForm.regionBilling settings=settings.regionBilling}}-->
-            <!--</div>-->
-            <!--<hr>-->
-            <!--<div class="row">-->
-              <!--{{> form/input-text columnWidth=6 name="phoneBilling" labelKey="form.phone" required=false
-               value=addressForm.phoneBilling settings=settings.phoneBilling}}-->
-              <!--{{> form/input-text columnWidth=6 name="emailBilling" labelKey="form.email" required=true
-               value=addressForm.emailBilling settings=settings.emailBilling}}-->
-            <!--</div>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
-    <!--</div>-->
-    <!--{{> checkout/continue-checkout-button}}-->
-</template>
-
-<script>
-export default {
-};
-</script>
-
-<i18n>
-en:
-  shippingAddress: "Shipping Address"
-  billingAddress: "Billing Address"
-  title: "Secure Checkout - Shipping"
-  differentBillingAddressCheckboxLabel: "Use a different address for billing"
-de:
-  billingAddress: "Zahlungsadresse"
-  shippingAddress: "Versandadresse"
-  title: "Sicherer Bestellprozess - Versand"
-  differentBillingAddressCheckboxLabel: "Abweichende Adresse als Rechnungsadresse verwenden."
-</i18n>
diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index 55d63d99..d7a54ff0 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -1,10 +1,14 @@
 <template>
-  <form @submit="submit(setShippingAddress)">
+  <form @submit.prevent="submit(setShippingAddress)">
     <div class="shipping-info">
       <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
-      <span class="pull-right required-fields">{{ $t('form.required') }} *</span>
     </div>
-    <div class="address-form">
+    <div class="address-form shipping-address-form">
+      <div class="row">
+        <div class="col-sm-12">
+          <ServerError :error="serverError"/>
+        </div>
+      </div>
       <div class="row">
         <div class="col-sm-6">
           <BaseInput v-model="form.firstName"
@@ -18,47 +22,40 @@
                      :vuelidate="$v.form.lastName"
                      :label="$t('lastName')"
                      type="text"
-                     autocomplete="lname"
-                     class="checkout-input-field"/>
+                     autocomplete="lname"/>
         </div>
         <div class="col-sm-12">
           <BaseInput v-model="form.streetName"
                      :vuelidate="$v.form.streetName"
                      :label="$t('streetName')"
                      type="text"
-                     autocomplete="shipping street-address"
-                     class="checkout-input-field"/>
+                     autocomplete="shipping street-address"/>
         </div>
         <div class="col-sm-12">
           <BaseInput v-model="form.additionalStreetInfo"
                      :vuelidate="$v.form.additionalStreetInfo"
                      :label="$t('additionalStreetInfo')"
+                     type="text"/>
+        </div>
+        <div class="col-sm-3">
+          <BaseInput v-model="form.postalCode"
+                     :vuelidate="$v.form.postalCode"
+                     :label="$t('postalCode')"
                      type="text"
-                     class="checkout-input-field"/>
+                     autocomplete="shipping postal-code"/>
         </div>
         <div class="col-sm-4">
           <BaseInput v-model="form.city"
                      :vuelidate="$v.form.city"
                      :label="$t('city')"
                      type="text"
-                     autocomplete="shipping locality"
-                     class="checkout-input-field"/>
-        </div>
-        <div class="col-sm-3">
-          <BaseInput v-model="form.postalCode"
-                     :vuelidate="$v.form.postalCode"
-                     :label="$t('postalCode')"
-                     type="text"
-                     autocomplete="shipping postal-code"
-                     class="checkout-input-field"/>
+                     autocomplete="shipping address-level2"/>
         </div>
         <div class="col-sm-5">
-          <div class="country input-block">
-            <BaseSelect v-model="form.country"
-                        :vuelidate="$v.form.country"
-                        :label="$t('country')"
-                        class="checkout-dropdown"/>
-          </div>
+          <BaseSelect v-model="form.country"
+                      :vuelidate="$v.form.country"
+                      :label="$t('country')"
+                      :options="countries"/>
         </div>
       </div>
       <hr>
@@ -68,23 +65,23 @@
                      :vuelidate="$v.form.phone"
                      :label="$t('phone')"
                      type="text"
-                     autocomplete="tel"
-                     class="checkout-input-field"/>
+                     autocomplete="tel"/>
         </div>
         <div class="col-sm-6">
           <BaseInput v-model="form.email"
                      :vuelidate="$v.form.email"
                      :label="$t('email')"
                      type="email"
-                     autocomplete="email"
-                     class="checkout-input-field"/>
+                     autocomplete="email"/>
         </div>
       </div>
     </div>
     <div class="row">
       <div class="col-sm-6">
         <div>
-          <LoadingButton id="shipping-continue-checkout-btn-xs"
+          <LoadingButton :buttonState="buttonState"
+                         type="submit"
+                         id="shipping-continue-checkout-btn-xs"
                          class="btn text-uppercase checkout-checkout-btn">
             {{ $t('continue') }}
           </LoadingButton>
@@ -97,29 +94,37 @@
 <script>
 import gql from 'graphql-tag';
 import { required, email } from 'vuelidate/lib/validators';
+import formMixin from '../../mixins/formMixin';
+import cartMixin from '../../mixins/cartMixin';
 import BaseInput from '../common/form/BaseInput.vue';
 import BaseSelect from '../common/form/BaseSelect.vue';
 import LoadingButton from '../common/form/LoadingButton.vue';
+import ServerError from '../common/form/ServerError.vue';
 
 export default {
   components: {
+    ServerError,
     LoadingButton,
     BaseSelect,
     BaseInput,
   },
 
-  props: {
-    address: {
-      type: Object,
-      default: () => ({}),
-    },
-  },
+  mixins: [formMixin, cartMixin],
 
   data: () => ({
     me: null,
     form: {},
   }),
 
+  computed: {
+    countries() {
+      return [
+        { id: 'DE', name: 'Deutschland' },
+        { id: 'US', name: 'United States' },
+      ];
+    },
+  },
+
   methods: {
     setShippingAddress() {
       return this.updateMyCart([
@@ -129,8 +134,10 @@ export default {
   },
 
   watch: {
-    address(value) {
-      this.form = { ...value.activeCart.shippingAddress };
+    me(value) {
+      const { contactInfo, ...address } = value.activeCart.shippingAddress;
+      this.form = { ...contactInfo, ...address };
+      delete this.form.__typename;
     },
   },
 
@@ -147,11 +154,13 @@ export default {
                 lastName
                 streetName
                 additionalStreetInfo
-                city
                 postalCode
+                city
                 country
-                phone
-                email
+                contactInfo {
+                  phone
+                  email
+                }
               }
             }
           }
@@ -159,27 +168,28 @@ export default {
     },
   },
 
-  validations() {
-    return {
-      form: {
-        firstName: { required },
-        lastName: { required },
-        streetName: { required },
-        additionalStreetInfo: {},
-        city: { required },
-        postalCode: { required },
-        country: { required },
-        phone: {},
-        email: { required, email },
-      },
-    };
+  validations: {
+    form: {
+      firstName: { required },
+      lastName: { required },
+      streetName: { required },
+      additionalStreetInfo: {},
+      postalCode: { required },
+      city: { required },
+      country: { required },
+      phone: {},
+      email: { required, email },
+    },
   },
 };
 </script>
 
-<style scoped>
-.address-form {
+<style lang="scss">
+.shipping-address-form {
   margin: 0.5em 1em;
+  .selectboxit, .selectboxit-options {
+    width: 100% !important;
+  }
 }
 </style>
 
diff --git a/src/components/common/form/BaseInput.vue b/src/components/common/form/BaseInput.vue
index c3db0c15..2f9b83af 100644
--- a/src/components/common/form/BaseInput.vue
+++ b/src/components/common/form/BaseInput.vue
@@ -64,6 +64,7 @@ export default {
 .form-field {
   width: 100%;
   position: relative;
+  display: inline-block;
 }
 
 input {
diff --git a/src/components/common/form/BaseSelect.vue b/src/components/common/form/BaseSelect.vue
index 41352a74..9d58faff 100644
--- a/src/components/common/form/BaseSelect.vue
+++ b/src/components/common/form/BaseSelect.vue
@@ -2,11 +2,18 @@
   <span class="form-field">
     <BaseLabel v-if="label"
                :vuelidate="vuelidate"
-               :label="label"/>
-    <SelectBoxIt :options="options"
+               :label="label">
+      <SelectBoxIt :options="options"
+                   v-model="model"
+                   v-bind="$attrs"
+                   :class="{ 'error': vuelidate.$error }"/>
+    </BaseLabel>
+    <SelectBoxIt v-else
+                 :options="options"
                  v-model="model"
                  v-bind="$attrs"
-                 :class="{ 'error': vuelidate.$error }"/>
+                 :class="{ 'error': vuelidate.$error }"
+                 class="select"/>
     <ValidationError :vuelidate="vuelidate"
                      :customErrors="customErrors"/>
   </span>
@@ -62,6 +69,9 @@ export default {
 </script>
 
 <style scoped>
+.select {
+  display: block;
+}
 .error {
   border-color: rgba(206, 65, 65, 0.6);
 }
diff --git a/src/components/common/form/SelectBoxIt.vue b/src/components/common/form/SelectBoxIt.vue
index 7a68231a..18fda1dc 100644
--- a/src/components/common/form/SelectBoxIt.vue
+++ b/src/components/common/form/SelectBoxIt.vue
@@ -37,3 +37,9 @@ export default {
   },
 };
 </script>
+
+<style>
+.selectboxit-container {
+  display: block;
+}
+</style>
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index d577b659..fb8ffe38 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -142,6 +142,7 @@ export default {
 
     openForm() {
       this.form = { ...this.me.customer };
+      delete this.form.__typename;
       this.showForm = true;
     },
 
diff --git a/sunrise.config.js b/sunrise.config.js
index 791d3922..81cc146b 100644
--- a/sunrise.config.js
+++ b/sunrise.config.js
@@ -17,10 +17,6 @@ export default {
     en: 'English',
     de: 'Deutsch',
   },
-  countries: {
-    DE: 'English',
-    US: 'United States',
-  },
   categories: {
     salesExternalId: '6',
   },

From fb48be7c26ebd80ab7837ee6aed80dce57a5f027 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 12:13:02 +0200
Subject: [PATCH 22/69] Fix e2e in cart detail page related to cart discounts

---
 tests/e2e/specs/cartDetailPage_spec.js | 22 +++++++--
 tests/e2e/support/commands.js          |  4 ++
 tests/e2e/support/mutations.js         | 68 ++++++++++++++++++++++++--
 tests/e2e/support/queries.js           | 20 ++++++++
 4 files changed, 106 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/specs/cartDetailPage_spec.js b/tests/e2e/specs/cartDetailPage_spec.js
index 5a19d693..959ff3f5 100644
--- a/tests/e2e/specs/cartDetailPage_spec.js
+++ b/tests/e2e/specs/cartDetailPage_spec.js
@@ -94,7 +94,21 @@ describe('CartDetailPage', () => {
     cy.get('[data-test=cart-line-item]').should('have.length', 0);
   });
 
+  const cartDiscount = {
+    value: {
+      relative: { permyriad: 5000 },
+    },
+    cartPredicate: '1=1',
+    sortOrder: Math.random().toString(),
+    name: { locale: 'en', value: '50% discount' },
+    requiresDiscountCode: true,
+    target: {
+      lineItems: { predicate: '1=1' },
+    },
+  };
+
   it('applies and deletes discount codes', () => {
+    cy.addDiscountCode(cartDiscount, 'SUNRISE_CI');
     cy.addLineItem('/product/lemare-booties-0778-brown/M0E20000000E0XM', 1);
     cy.visit('/cart');
 
@@ -102,18 +116,18 @@ describe('CartDetailPage', () => {
       .contains(/^\s*248,75\s€\s*$/);
 
     cy.get('[data-test=discount-code-input]')
-      .type('CODE2019');
+      .type('SUNRISE_CI');
     cy.get('[data-test=apply-discount-code-button]')
       .click();
     cy.get('[data-test=cart-total-price]')
-      .contains(/^\s*236,31\s€\s*$/);
+      .contains(/^\s*124,37\s€\s*$/);
 
     cy.get('[data-test=discount-code-name]')
-      .contains('CODE2019');
+      .contains('SUNRISE_CI');
     cy.get('[data-test=remove-discount-button]')
       .click();
 
     cy.get('[data-test=cart-line-item-total-price]')
-      .contains(/^\s*248,75\s€\s*$/);
+      .contains(/^\s*124,37\s€\s*$/);
   });
 });
diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
index 05868527..86a4d783 100644
--- a/tests/e2e/support/commands.js
+++ b/tests/e2e/support/commands.js
@@ -56,6 +56,10 @@ Cypress.Commands.add('addLineItem', (url, quantity) => {
   cy.get('[data-test=mini-cart-content]').should('be.visible');
 });
 
+Cypress.Commands.add('addDiscountCode', (cartDiscountDraft, code) => cy.wrap(clientPromise
+  .then(client => mutation.deleteDiscountCode(client, code)
+    .then(() => mutation.createDiscountCode(client, cartDiscountDraft, code)))));
+
 Cypress.Commands.add('createOrder', (cartDraft, orderDraft) => cy.wrap(clientPromise
   .then(client => mutation.deleteOrder(client, orderDraft.orderNumber)
     .then(() => query.customerByEmail(client, cartDraft.customerEmail)
diff --git a/tests/e2e/support/mutations.js b/tests/e2e/support/mutations.js
index ae1933b8..62a914a1 100644
--- a/tests/e2e/support/mutations.js
+++ b/tests/e2e/support/mutations.js
@@ -45,6 +45,68 @@ export function createOrder(client, draft) {
   }).then(response => response.data.createOrderFromCart);
 }
 
+export function createDiscountCode(client, cartDiscountDraft, code) {
+  return client.mutate({
+    mutation: gql`
+      mutation createNewCartDiscount($draft: CartDiscountDraft!) {
+        createCartDiscount(draft: $draft) {
+          id
+        }
+      }`,
+    variables: {
+      draft: cartDiscountDraft,
+    },
+  })
+    .then(response => response.data.createCartDiscount.id)
+    .then(id => client.mutate({
+      mutation: gql`
+      mutation createNewDiscountCode($id: String!, $code: String!) {
+        createDiscountCode(draft: {
+          code: $code,
+          cartDiscounts: {
+            typeId: "cart-discount",
+            id: $id
+          }
+        }) {
+          id
+        }
+      }`,
+      variables: { code, id },
+    })).then(response => response.data.createDiscountCode);
+}
+
+export function deleteDiscountCode(client, code) {
+  return query.discountCodeByCode(client, code)
+    .then(async (discountCode) => {
+      if (discountCode) {
+        await client.mutate({
+          mutation: gql`
+          mutation deleteDiscountCode($id: String!, $version: Long!) {
+            deleteDiscountCode(id: $id, version: $version) {
+              id
+            }
+          }`,
+          variables: {
+            id: discountCode.id,
+            version: discountCode.version,
+          },
+        }).catch(e => console.warn('Discount code might have already been deleted', e));
+        await discountCode.cartDiscounts.forEach(cartDiscount => client.mutate({
+          mutation: gql`
+              mutation deleteCartDiscount($id: String!, $version: Long!) {
+                deleteCartDiscount(id: $id, version: $version) {
+                  id
+                }
+              }`,
+          variables: {
+            id: cartDiscount.id,
+            version: cartDiscount.version,
+          },
+        }).catch(e => console.warn('Cart discount might have already been deleted', e)));
+      }
+    });
+}
+
 export function deleteOrder(client, orderNumber) {
   return query.orderByNumber(client, orderNumber)
     .then(async (order) => {
@@ -60,8 +122,7 @@ export function deleteOrder(client, orderNumber) {
             id: order.id,
             version: order.version,
           },
-        }).then(response => response.data.deleteOrder)
-          .catch(e => console.warn('Order might have already been deleted', e));
+        }).catch(e => console.warn('Order might have already been deleted', e));
       }
     });
 }
@@ -81,8 +142,7 @@ export function deleteCustomer(client, email) {
             id: customer.id,
             version: customer.version,
           },
-        }).then(response => response.data.deleteCustomer)
-          .catch(e => console.warn('Customer might have already been deleted', e));
+        }).catch(e => console.warn('Customer might have already been deleted', e));
       }
     });
 }
diff --git a/tests/e2e/support/queries.js b/tests/e2e/support/queries.js
index 7847474d..99680bb9 100644
--- a/tests/e2e/support/queries.js
+++ b/tests/e2e/support/queries.js
@@ -31,3 +31,23 @@ export function orderByNumber(client, orderNumber) {
     fetchPolicy: 'network-only',
   }).then(response => response.data.orders.results[0]);
 }
+
+export function discountCodeByCode(client, code) {
+  return client.query({
+    query: gql`
+      query queryDiscountCodeByCode($predicate: String) {
+        discountCodes(limit: 1, where: $predicate) {
+          results {
+            version,
+            id
+            cartDiscounts {
+              id
+              version
+            }
+          }
+        }
+      }`,
+    variables: { predicate: `code = "${code}"` },
+    fetchPolicy: 'network-only',
+  }).then(response => response.data.discountCodes.results[0]);
+}

From 2a1774b7b92f4cff0dcc04ca541bc629a1fd53c3 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 12:19:59 +0200
Subject: [PATCH 23/69] Fix e2e in order detail page related to cart discounts

---
 tests/e2e/specs/orderDetail_spec.js | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/specs/orderDetail_spec.js b/tests/e2e/specs/orderDetail_spec.js
index 2fec4f88..eb864489 100644
--- a/tests/e2e/specs/orderDetail_spec.js
+++ b/tests/e2e/specs/orderDetail_spec.js
@@ -1,4 +1,17 @@
 describe('OrderDetailPage', () => {
+  const cartDiscount = {
+    value: {
+      relative: { permyriad: 5000 },
+    },
+    cartPredicate: '1=1',
+    sortOrder: Math.random().toString(),
+    name: { locale: 'en', value: '50% discount' },
+    requiresDiscountCode: true,
+    target: {
+      lineItems: { predicate: '1=1' },
+    },
+  };
+
   const customerDraft = {
     firstName: 'Charlie',
     lastName: 'Bucket',
@@ -53,10 +66,11 @@ describe('OrderDetailPage', () => {
       quantity: 2,
     },
     ],
-    discountCodes: ['CODE2019'],
+    discountCodes: ['SUNRISE_CI'],
   };
 
   before(() => {
+    cy.addDiscountCode(cartDiscount, 'SUNRISE_CI');
     cy.login(customerDraft);
     cy.createOrder(cartDraft, orderDraft);
   });
@@ -71,13 +85,13 @@ describe('OrderDetailPage', () => {
     cy.get('[data-test=details-order-date]')
       .contains(/^\s*\d{1,2}\.*\s*[A-Za-zäÄöÖüÜß].+\s*\d{4}\s*$/);
     cy.get('[data-test=cart-subtotal-price]')
-      .contains(/^\s*349,21\s€\s*$/);
+      .contains(/^\s*183,80\s€\s*$/);
     cy.get('[data-test=cart-shipping-price]')
       .contains(/^\s*10,00\s€\s*$/);
     cy.get('[data-test=cart-taxes-amount]')
-      .contains(/^\s*60,29\s€\s*$/);
+      .contains(/^\s*30,95\s€\s*$/);
     cy.get('[data-test=cart-total-price]')
-      .contains(/^\s*349,21\s€\s*$/);
+      .contains(/^\s*193,80\s€\s*$/);
     cy.get('[data-test=cart-line-item]')
       .should('have.length', 2)
       .eq(1)
@@ -90,7 +104,7 @@ describe('OrderDetailPage', () => {
           .contains(/^\s*139,30\s€\s*$/);
       });
     cy.get('[data-test=discount-code-name]')
-      .contains('CODE2019');
+      .contains('SUNRISE_CI');
     cy.get('[data-test=remove-discount-button]')
       .should('not.exist');
   });

From b4d37ae02a59412aa0c75185fcee829cab4b821a Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 16:02:30 +0200
Subject: [PATCH 24/69] Remove quickview, as it's not going to be implemented

---
 src/components/common/ProductThumbnail.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/common/ProductThumbnail.vue b/src/components/common/ProductThumbnail.vue
index fa7d6916..38fd7ffb 100644
--- a/src/components/common/ProductThumbnail.vue
+++ b/src/components/common/ProductThumbnail.vue
@@ -60,11 +60,11 @@
         </div>
       </div>
       <div class="shop-item-overlay hidden-xs">
-        <button type="button"
-                class="quickview"
-                data-modal="quickview-modal">
-          {{ $t("quickView") }}
-        </button>
+        <!--<button type="button"-->
+                <!--class="quickview"-->
+                <!--data-modal="quickview-modal">-->
+          <!--{{ $t("quickView") }}-->
+        <!--</button>-->
          <!-- <form id="form-add-to-wishlist{{index}}"
                     method="post"
                     {{#if wishlist}}class="hidden"{{/if}}

From 04a7b8f255bf7ff592b035600cf51adebadab77b Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 16:03:07 +0200
Subject: [PATCH 25/69] remove unnecessary (for now) permission

---
 sunrise.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sunrise.config.js b/sunrise.config.js
index 81cc146b..a5106d94 100644
--- a/sunrise.config.js
+++ b/sunrise.config.js
@@ -9,7 +9,7 @@ export default {
       },
       scopes: [process.env.VUE_APP_CT_SCOPE || 'manage_my_profile:sunrise-spa create_anonymous_token:sunrise-spa'
       + ' manage_my_payments:sunrise-spa view_products:sunrise-spa manage_my_orders:sunrise-spa'
-      + ' manage_my_shopping_lists:sunrise-spa view_project_settings:sunrise-spa'],
+      + ' manage_my_shopping_lists:sunrise-spa'],
     },
     api: process.env.VUE_APP_CT_API_HOST || 'https://api.sphere.io',
   },

From 368d60bdec4bf7c1f3edae1d55f598f8656eea4e Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 17:35:30 +0200
Subject: [PATCH 26/69] unit test shipping address form in checkout

---
 .../checkout/StepShippingAddressForm.vue      |  11 +-
 .../checkout/StepShippingAddressForm.spec.js  | 100 ++++++++++++++++++
 2 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 tests/unit/specs/components/checkout/StepShippingAddressForm.spec.js

diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index d7a54ff0..fd7a2034 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -1,5 +1,6 @@
 <template>
-  <form @submit.prevent="submit(setShippingAddress)">
+  <form v-if="cartExists"
+        @submit.prevent="submit(setShippingAddress)">
     <div class="shipping-info">
       <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
     </div>
@@ -135,9 +136,11 @@ export default {
 
   watch: {
     me(value) {
-      const { contactInfo, ...address } = value.activeCart.shippingAddress;
-      this.form = { ...contactInfo, ...address };
-      delete this.form.__typename;
+      if (value?.activeCart?.shippingAddress) {
+        const { contactInfo, ...address } = value.activeCart.shippingAddress;
+        this.form = { ...contactInfo, ...address };
+        delete this.form.__typename;
+      }
     },
   },
 
diff --git a/tests/unit/specs/components/checkout/StepShippingAddressForm.spec.js b/tests/unit/specs/components/checkout/StepShippingAddressForm.spec.js
new file mode 100644
index 00000000..55b08c8b
--- /dev/null
+++ b/tests/unit/specs/components/checkout/StepShippingAddressForm.spec.js
@@ -0,0 +1,100 @@
+import Vuelidate from 'vuelidate';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import StepShippingAddressForm from '@/components/checkout/StepShippingAddressForm.vue';
+
+const localVue = createLocalVue();
+localVue.use(Vuelidate);
+
+describe('StepShippingAddressForm.vue', () => {
+  let options;
+
+  beforeEach(() => {
+    options = {
+      localVue,
+      mocks: { $t: jest.fn() },
+    };
+  });
+
+  it('renders a vue instance', () => {
+    expect(shallowMount(StepShippingAddressForm, options).isVueInstance()).toBeTruthy();
+  });
+
+  it('does not set form when no shipping address defined in cart', () => {
+    const wrapper = shallowMount(StepShippingAddressForm, options);
+    expect(wrapper.vm.form).toEqual({});
+
+    wrapper.setData({ me: { } });
+    expect(wrapper.vm.form).toEqual({});
+
+    wrapper.setData({ me: { activeCart: null } });
+    expect(wrapper.vm.form).toEqual({});
+
+    wrapper.setData({ me: { activeCart: { shippingAddress: null } } });
+    expect(wrapper.vm.form).toEqual({});
+  });
+
+  it('sets shipping address in form if defined', () => {
+    const wrapper = shallowMount(StepShippingAddressForm, options);
+    expect(wrapper.vm.form).toEqual({});
+
+    wrapper.setData({
+      me: {
+        activeCart: {
+          shippingAddress: {
+            country: 'DE',
+          },
+        },
+      },
+    });
+    expect(wrapper.vm.form).toEqual({
+      country: 'DE',
+    });
+  });
+
+  it('removes typename from response when copying to form', () => {
+    const wrapper = shallowMount(StepShippingAddressForm, options);
+    expect(wrapper.vm.form).toEqual({});
+
+    wrapper.setData({
+      me: {
+        activeCart: {
+          shippingAddress: {
+            firstName: 'Willy',
+            country: 'DE',
+            __typename: 'ShippingAddress',
+          },
+        },
+      },
+    });
+    expect(wrapper.vm.form).toEqual({
+      firstName: 'Willy',
+      country: 'DE',
+    });
+  });
+
+  it('flatters contact info in form', () => {
+    const wrapper = shallowMount(StepShippingAddressForm, options);
+    expect(wrapper.vm.form).toEqual({});
+
+    wrapper.setData({
+      me: {
+        activeCart: {
+          shippingAddress: {
+            firstName: 'Willy',
+            country: 'DE',
+            contactInfo: {
+              email: 'foo@example.com',
+              phone: '+1234',
+            },
+          },
+        },
+      },
+    });
+    expect(wrapper.vm.form).toEqual({
+      firstName: 'Willy',
+      country: 'DE',
+      email: 'foo@example.com',
+      phone: '+1234',
+    });
+  });
+});

From 1791b3cfa237b5a4bc4375ed4732ff0ca430b723 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 17:49:44 +0200
Subject: [PATCH 27/69] apply common style to countries dropdown in checkout
 shipping address

---
 src/components/checkout/StepShippingAddressForm.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index fd7a2034..41ca8fb5 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -1,6 +1,7 @@
 <template>
   <form v-if="cartExists"
-        @submit.prevent="submit(setShippingAddress)">
+        @submit.prevent="submit(setShippingAddress)"
+        id="checkout-shipping-address-form">
     <div class="shipping-info">
       <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
     </div>
@@ -188,8 +189,15 @@ export default {
 </script>
 
 <style lang="scss">
-.shipping-address-form {
+#checkout-shipping-address-form {
   margin: 0.5em 1em;
+
+  .selectboxit {
+    background: url('../../assets/img/arrow-67-filled.png') no-repeat 90% 50% #fff;
+    background-size: 12px;
+    border: 1px solid #D6D6D6;
+    border-radius: 1px;
+  }
   .selectboxit, .selectboxit-options {
     width: 100% !important;
   }

From e22ebbf6583cf423988fd3189c851c3834eee0b4 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 17:58:35 +0200
Subject: [PATCH 28/69] fix style of continue button in checkout

---
 src/assets/scss/_checkout-shipping.scss      | 2 +-
 src/components/common/form/LoadingButton.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
index 80abf61d..8f7eef8a 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -151,7 +151,7 @@
   background: url("../img/arrow-66.png") no-repeat 95% 13px $my-sin;
   background-size: 15px;
   border: none;
-  margin: 1em;
+  margin: 1em 0;
   padding: 0.5em 0;
   font-size: 1.2em;
   &:hover {
diff --git a/src/components/common/form/LoadingButton.vue b/src/components/common/form/LoadingButton.vue
index 0e97c553..9fc88545 100644
--- a/src/components/common/form/LoadingButton.vue
+++ b/src/components/common/form/LoadingButton.vue
@@ -58,7 +58,7 @@ export default {
 button {
   margin-right: 15px;
   font-weight: 900;
-  background: #FFBA27;
+  background-color: #FFBA27;
   padding: 10px 20px;
   text-transform: uppercase;
   font-size: 16px;
@@ -66,7 +66,7 @@ button {
   position: relative;
 
   &:hover {
-   background: lighten(#FFBA27, 5%);
+   background-color: lighten(#FFBA27, 5%);
   }
 
   .state-layer {

From 14b201e96142c252fca71fa2008b99a03dcb5d4f Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 18:16:26 +0200
Subject: [PATCH 29/69] fix style for base select when there's an error

---
 src/components/common/form/BaseSelect.vue | 29 +++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/common/form/BaseSelect.vue b/src/components/common/form/BaseSelect.vue
index 9d58faff..acbf9fda 100644
--- a/src/components/common/form/BaseSelect.vue
+++ b/src/components/common/form/BaseSelect.vue
@@ -1,19 +1,17 @@
 <template>
-  <span class="form-field">
+  <span class="form-field base-select"
+        :class="{ 'error': vuelidate.$error }">
     <BaseLabel v-if="label"
                :vuelidate="vuelidate"
                :label="label">
       <SelectBoxIt :options="options"
                    v-model="model"
-                   v-bind="$attrs"
-                   :class="{ 'error': vuelidate.$error }"/>
+                   v-bind="$attrs"/>
     </BaseLabel>
     <SelectBoxIt v-else
                  :options="options"
                  v-model="model"
-                 v-bind="$attrs"
-                 :class="{ 'error': vuelidate.$error }"
-                 class="select"/>
+                 v-bind="$attrs"/>
     <ValidationError :vuelidate="vuelidate"
                      :customErrors="customErrors"/>
   </span>
@@ -68,11 +66,18 @@ export default {
 };
 </script>
 
-<style scoped>
-.select {
-  display: block;
-}
-.error {
-  border-color: rgba(206, 65, 65, 0.6);
+<style lang="scss">
+.form-field.base-select {
+  display: inline-block;
+  width: 100%;
+  position: relative;
+
+  .selectboxit {
+    display: block;
+  }
+
+  &.error .selectboxit {
+     border-color: rgba(206, 65, 65, 0.6) !important;
+   }
 }
 </style>

From bf7e1132fcc0ab6c892a578e3aaa16f4a6a1c7ec Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 18:20:27 +0200
Subject: [PATCH 30/69] fix style for checkout title

---
 src/assets/scss/_checkout-shipping.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
index 8f7eef8a..cf360da2 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -57,7 +57,7 @@
   margin-bottom: 2em;
 }
 .shipping-info {
-  margin: 1em;
+  margin: 1em 0;
   padding-bottom: 1em;
   border-bottom: 1px solid $alto;
 }

From 27ee2a6240d2c1e038078fa5926bcab938361ec8 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 11 Jul 2019 18:26:55 +0200
Subject: [PATCH 31/69] add "select country" option in checkout shipping
 address dropdown

---
 src/components/checkout/StepShippingAddressForm.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index 41ca8fb5..859cefb9 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -121,6 +121,7 @@ export default {
   computed: {
     countries() {
       return [
+        { id: null, name: this.$t('selectCountry') },
         { id: 'DE', name: 'Deutschland' },
         { id: 'US', name: 'United States' },
       ];
@@ -217,6 +218,7 @@ en:
   email: "Email"
   phone: "Phone"
   continue: "Continue"
+  selectCountry: "Select country"
 de:
   shippingInformation: "Versand Information"
   firstName: "Vorname"
@@ -229,4 +231,5 @@ de:
   email: "E-Mail-Adresse"
   phone: "Telefon"
   continue: "Weiter"
+  selectCountry: "Land auswählen"
 </i18n>

From 4c382bdb0daa815d214b088e450b56729877d03a Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 16 Jul 2019 17:44:28 +0200
Subject: [PATCH 32/69] Abstract form implementation in BaseForm component

---
 src/assets/scss/_checkout-shipping.scss       |  13 --
 src/components/BaseAddress.gql                |  13 ++
 .../cartdetail/AddDiscountCodeForm.vue        |  15 +-
 .../cartdetail/LineItemQuantityForm.vue       |  20 +-
 src/components/checkout/BaseAddressForm.vue   | 189 ++++++++++++++++
 .../checkout/CheckoutNavigation.vue           |  75 +++++++
 src/components/checkout/PageCheckout.vue      |  20 +-
 .../checkout/StepBillingAddressForm.vue       | 107 +++++++++
 .../checkout/StepShippingAddressForm.vue      | 204 ++----------------
 .../common/cartlike/LineItemInfo.vue          |   4 +-
 src/components/common/form/BaseForm.vue       |  44 ++++
 src/components/common/form/BaseInput.vue      |  14 +-
 src/components/common/form/BaseLabel.vue      |   3 +-
 src/components/common/form/LoadingButton.vue  |  19 +-
 src/components/login/LoginForm.vue            |  15 +-
 src/components/login/SignUpForm.vue           |  15 +-
 .../productdetail/AddToCartForm.vue           |  15 +-
 .../userdetail/EditProfileForm.vue            |  25 ++-
 src/mixins/cartMixin.js                       |  10 +-
 src/mixins/formMixin.js                       |  29 ---
 src/router.js                                 |  14 +-
 .../cartdetail/LineItemQuantityForm.spec.js   |  23 +-
 .../checkout/BaseAddressForm.spec.js          |  64 ++++++
 .../checkout/StepShippingAddressForm.spec.js  | 100 ---------
 .../userprofile/EditProfileForm.spec.js       |  25 ++-
 25 files changed, 651 insertions(+), 424 deletions(-)
 create mode 100644 src/components/BaseAddress.gql
 create mode 100644 src/components/checkout/BaseAddressForm.vue
 create mode 100644 src/components/checkout/CheckoutNavigation.vue
 create mode 100644 src/components/checkout/StepBillingAddressForm.vue
 create mode 100644 src/components/common/form/BaseForm.vue
 delete mode 100644 src/mixins/formMixin.js
 create mode 100644 tests/unit/specs/components/checkout/BaseAddressForm.spec.js
 delete mode 100644 tests/unit/specs/components/checkout/StepShippingAddressForm.spec.js

diff --git a/src/assets/scss/_checkout-shipping.scss b/src/assets/scss/_checkout-shipping.scss
index cf360da2..12c8d2ef 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -146,19 +146,6 @@
 .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 0;
-  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 {
diff --git a/src/components/BaseAddress.gql b/src/components/BaseAddress.gql
new file mode 100644
index 00000000..57e92df9
--- /dev/null
+++ b/src/components/BaseAddress.gql
@@ -0,0 +1,13 @@
+fragment BaseAddress on Address {
+  firstName
+  lastName
+  streetName
+  additionalStreetInfo
+  postalCode
+  city
+  country
+  contactInfo {
+    phone
+    email
+  }
+}
\ No newline at end of file
diff --git a/src/components/cartdetail/AddDiscountCodeForm.vue b/src/components/cartdetail/AddDiscountCodeForm.vue
index 27416864..17007219 100644
--- a/src/components/cartdetail/AddDiscountCodeForm.vue
+++ b/src/components/cartdetail/AddDiscountCodeForm.vue
@@ -1,7 +1,9 @@
 <template>
-  <form @submit.prevent="submit(addDiscountCode)">
+  <BaseForm :vuelidate="$v"
+            :onSubmit="addDiscountCode"
+            #default="{ error, state }">
     <div class="text-right add-discount-code-form">
-      <ServerError :error="serverError"
+      <ServerError :error="error"
                    v-slot="{ graphQLError }"
                    class="server-error">
         {{ getErrorMessage(graphQLError) }}
@@ -12,25 +14,26 @@
                  type="text"
                  id="promo-code"
                  data-test="discount-code-input"/>
-      <LoadingButton :buttonState="buttonState"
+      <LoadingButton :state="state"
                      class="submit-button"
                      data-test="apply-discount-code-button">
         {{ $t('apply') }}
       </LoadingButton>
     </div>
-  </form>
+  </BaseForm>
 </template>
 
 <script>
 import { required } from 'vuelidate/lib/validators';
 import LoadingButton from '../common/form/LoadingButton.vue';
 import ServerError from '../common/form/ServerError.vue';
+import BaseForm from '../common/form/BaseForm.vue';
 import BaseInput from '../common/form/BaseInput.vue';
 import cartMixin from '@/mixins/cartMixin';
-import formMixin from '@/mixins/formMixin';
 
 export default {
   components: {
+    BaseForm,
     BaseInput,
     LoadingButton,
     ServerError,
@@ -61,7 +64,7 @@ export default {
     },
   },
 
-  mixins: [cartMixin, formMixin],
+  mixins: [cartMixin],
 
   validations: {
     form: {
diff --git a/src/components/cartdetail/LineItemQuantityForm.vue b/src/components/cartdetail/LineItemQuantityForm.vue
index e5db2f8c..781588c4 100644
--- a/src/components/cartdetail/LineItemQuantityForm.vue
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -1,6 +1,11 @@
 <template>
-  <div v-if="cartExists"
-       class="quantity-spinner">
+  <BaseForm v-if="cartExists"
+            :vuelidate="$v"
+            :onSubmit="changeLineItemQuantity"
+            #default="{ error }"
+            ref="form"
+            class="quantity-spinner">
+    <ServerError :error="error"/>
     <span @click="form.quantity -= 1"
           data-test="cart-line-item-quantity-dec"
           class="change-quantity-button input-number-decrement">–</span>
@@ -12,7 +17,7 @@
     <span @click="form.quantity += 1"
           data-test="cart-line-item-quantity-inc"
           class="change-quantity-button input-number-increment">+</span>
-  </div>
+  </BaseForm>
 </template>
 
 <script>
@@ -20,14 +25,17 @@ import debounce from 'lodash.debounce';
 import { required, minValue, numeric } from 'vuelidate/lib/validators';
 import BaseInput from '../common/form/BaseInput.vue';
 import cartMixin from '../../mixins/cartMixin';
-import formMixin from '../../mixins/formMixin';
+import BaseForm from '../common/form/BaseForm.vue';
+import ServerError from '../common/form/ServerError.vue';
 
 export default {
   components: {
+    ServerError,
+    BaseForm,
     BaseInput,
   },
 
-  mixins: [cartMixin, formMixin],
+  mixins: [cartMixin],
 
   props: {
     lineItemId: {
@@ -61,7 +69,7 @@ export default {
 
   created() {
     this.form.quantity = this.quantity;
-    this.debouncedSubmit = debounce(() => this.submit(this.changeLineItemQuantity), 500);
+    this.debouncedSubmit = debounce(() => this.$refs.form.submit(), 500);
   },
 
   watch: {
diff --git a/src/components/checkout/BaseAddressForm.vue b/src/components/checkout/BaseAddressForm.vue
new file mode 100644
index 00000000..e20f5f62
--- /dev/null
+++ b/src/components/checkout/BaseAddressForm.vue
@@ -0,0 +1,189 @@
+<template>
+  <BaseForm :vuelidate="$v"
+            :onSubmit="submit"
+            #default="{ error, state }"
+            class="checkout-address-form">
+    <div class="shipping-info">
+      <span class="text-uppercase shipping-info-title">{{ title }}</span>
+    </div>
+    <div class="address-form shipping-address-form">
+      <div class="row">
+        <div class="col-sm-12">
+          <ServerError :error="error"/>
+        </div>
+      </div>
+      <slot/>
+      <slot name="fields">
+        <div class="row">
+          <div class="col-sm-6">
+            <BaseInput v-model="form.firstName"
+                       :vuelidate="$v.form.firstName"
+                       :label="$t('firstName')"
+                       type="text"
+                       autocomplete="fname"/>
+          </div>
+          <div class="col-sm-6">
+            <BaseInput v-model="form.lastName"
+                       :vuelidate="$v.form.lastName"
+                       :label="$t('lastName')"
+                       type="text"
+                       autocomplete="lname"/>
+          </div>
+          <div class="col-sm-12">
+            <BaseInput v-model="form.streetName"
+                       :vuelidate="$v.form.streetName"
+                       :label="$t('streetName')"
+                       type="text"
+                       autocomplete="street-address"/>
+          </div>
+          <div class="col-sm-12">
+            <BaseInput v-model="form.additionalStreetInfo"
+                       :vuelidate="$v.form.additionalStreetInfo"
+                       :label="$t('additionalStreetInfo')"
+                       type="text"/>
+          </div>
+          <div class="col-sm-3">
+            <BaseInput v-model="form.postalCode"
+                       :vuelidate="$v.form.postalCode"
+                       :label="$t('postalCode')"
+                       type="text"
+                       autocomplete="postal-code"/>
+          </div>
+          <div class="col-sm-4">
+            <BaseInput v-model="form.city"
+                       :vuelidate="$v.form.city"
+                       :label="$t('city')"
+                       type="text"
+                       autocomplete="address-level2"/>
+          </div>
+          <div class="col-sm-5">
+            <BaseSelect v-model="form.country"
+                        :vuelidate="$v.form.country"
+                        :label="$t('country')"
+                        :options="countries"/>
+          </div>
+        </div>
+        <hr>
+        <div class="row">
+          <div class="col-sm-6">
+            <BaseInput v-model="form.phone"
+                       :vuelidate="$v.form.phone"
+                       :label="$t('phone')"
+                       type="text"
+                       autocomplete="tel"/>
+          </div>
+          <div class="col-sm-6">
+            <BaseInput v-model="form.email"
+                       :vuelidate="$v.form.email"
+                       :label="$t('email')"
+                       type="email"
+                       autocomplete="email"/>
+          </div>
+        </div>
+      </slot>
+    </div>
+    <CheckoutNavigation :state="state"
+                        @back="goBack"/>
+  </BaseForm>
+</template>
+
+<script>
+import { required, email } from 'vuelidate/lib/validators';
+import BaseInput from '../common/form/BaseInput.vue';
+import BaseSelect from '../common/form/BaseSelect.vue';
+import ServerError from '../common/form/ServerError.vue';
+import CheckoutNavigation from './CheckoutNavigation.vue';
+import BaseForm from '../common/form/BaseForm.vue';
+
+export default {
+  components: {
+    BaseForm,
+    CheckoutNavigation,
+    ServerError,
+    BaseInput,
+    BaseSelect,
+  },
+
+  props: {
+    address: Object,
+    title: String,
+    onSubmit: Function,
+  },
+
+  data: () => ({
+    form: {},
+  }),
+
+  computed: {
+    countries() {
+      return [
+        { id: null, name: this.$t('selectCountry') },
+        { id: 'DE', name: 'Deutschland' },
+        { id: 'US', name: 'United States' },
+      ];
+    },
+  },
+
+  methods: {
+    submit() {
+      console.log(this.form);
+      return this.onSubmit(this.form);
+    },
+
+    goBack() {
+      return this.$emit('back');
+    },
+  },
+
+  created() {
+    if (this.address) {
+      const { contactInfo, ...address } = this.address;
+      this.form = { ...contactInfo, ...address };
+      delete this.form.__typename;
+    }
+  },
+
+  validations: {
+    form: {
+      firstName: { required },
+      lastName: { required },
+      streetName: { required },
+      additionalStreetInfo: {},
+      postalCode: { required },
+      city: { required },
+      country: { required },
+      phone: {},
+      email: { required, email },
+    },
+  },
+};
+</script>
+
+<i18n>
+en:
+  firstName: "First Name"
+  lastName: "Last Name"
+  streetName: "Address"
+  additionalStreetInfo: "Additional address info"
+  city: "City"
+  postalCode: "Postal Code"
+  country: "Country"
+  email: "Email"
+  phone: "Phone"
+  back: "Back"
+  continue: "Continue"
+  selectCountry: "Select country"
+de:
+  firstName: "Vorname"
+  lastName: "Nachname"
+  streetName: "Straße und Hausnummer"
+  additionalStreetInfo: "Adresszusatz"
+  city: "Stadt"
+  postalCode: "PLZ"
+  country: "Land"
+  email: "E-Mail-Adresse"
+  phone: "Telefon"
+  back: "Zurück"
+  continue: "Weiter"
+  selectCountry: "Land auswählen"
+</i18n>
diff --git a/src/components/checkout/CheckoutNavigation.vue b/src/components/checkout/CheckoutNavigation.vue
new file mode 100644
index 00000000..45bdb2a3
--- /dev/null
+++ b/src/components/checkout/CheckoutNavigation.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="row checkout-navigation-buttons">
+    <div class="col-sm-6 col-xs-6">
+      <div>
+        <button @click="goBack"
+                type="button"
+                class="btn-grey text-uppercase back-button">
+          {{ $t('back') }}
+        </button>
+      </div>
+    </div>
+    <div class="col-sm-6 col-xs-6">
+      <div>
+        <LoadingButton :state="state"
+                       id="shipping-continue-checkout-btn-xs"
+                       class="btn text-uppercase next-button">
+          {{ $t('continue') }}
+        </LoadingButton>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import LoadingButton from '../common/form/LoadingButton.vue';
+
+export default {
+  components: { LoadingButton },
+
+  props: ['state'],
+
+  methods: {
+    goBack() {
+      this.$emit('back');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.checkout-navigation-buttons {
+  margin-top: 2em;
+  margin-bottom: 1em;
+
+  .next-button, .back-button {
+    border: 2px solid;
+    width: 100%;
+    padding: 10px 20px;
+    font-size: 1.2em;
+  }
+
+  .next-button {
+    background: url('../../assets/img/arrow-66.png') no-repeat 95% 13px #FFBA27;
+    background-size: 15px;
+    border-color: #FFBA27;
+    /*padding: 0.5em 0;*/
+    &:hover {
+      background: url('../../assets/img/arrow-66.png') no-repeat 95% 13px lighten(#FFBA27, 5%);
+      background-size: 15px;
+    }
+  }
+
+  .back-button {
+    color: #222;
+    border-color: #DDD;
+    background: url('../../assets/img/arrow-67-black.png') no-repeat 10% 50%;
+    background-size: 15px;
+    &:hover {
+      opacity: 0.6;
+      color: inherit;
+      border-color: #666;
+    }
+  }
+}
+</style>
diff --git a/src/components/checkout/PageCheckout.vue b/src/components/checkout/PageCheckout.vue
index 7caadacd..552f4358 100644
--- a/src/components/checkout/PageCheckout.vue
+++ b/src/components/checkout/PageCheckout.vue
@@ -36,7 +36,7 @@
           <div class="checkout">
             <div class="row">
               <div class="col-sm-7">
-                <component :is="showStep"/>
+                <router-view class="checkout-form-step"/>
               </div>
               <div class="col-sm-5">
                 <CartOverview/>
@@ -51,18 +51,32 @@
 
 <script>
 import CartOverview from './CartOverview.vue';
-import StepShippingAddressForm from './StepShippingAddressForm.vue';
 
 export default {
   components: {
     CartOverview,
-    StepShippingAddressForm,
   },
 
   props: ['showStep'],
 };
 </script>
 
+<style lang="scss">
+.checkout-form-step {
+  margin: 0.5em 1em;
+
+  .selectboxit {
+    background: url('../../assets/img/arrow-67-filled.png') no-repeat 90% 50% #fff;
+    background-size: 12px;
+    border: 1px solid #D6D6D6;
+    border-radius: 1px;
+  }
+  .selectboxit, .selectboxit-options {
+    width: 100% !important;
+  }
+}
+</style>
+
 <i18n>
 en:
   secureCheckout: "Secure Checkout"
diff --git a/src/components/checkout/StepBillingAddressForm.vue b/src/components/checkout/StepBillingAddressForm.vue
new file mode 100644
index 00000000..cef84b43
--- /dev/null
+++ b/src/components/checkout/StepBillingAddressForm.vue
@@ -0,0 +1,107 @@
+<template>
+  <div v-if="cartExists">
+    <BaseAddressForm :address="billingAddress"
+                     :title="$t('billingInformation')"
+                     :onSubmit="handleSubmit"
+                     @back="goToShipping">
+      <div class="row">
+        <div class="col-sm-12">
+          <BaseInput v-model="sameAddress"
+                     :label="$t('sameAddress')"
+                     type="checkbox"/>
+        </div>
+      </div>
+      <template v-if="sameAddress"
+                v-slot:fields>
+        <BaseAddress :address="shippingAddress"/>
+      </template>
+    </BaseAddressForm>
+  </div>
+</template>
+
+<script>
+import gql from 'graphql-tag';
+import { required } from 'vuelidate/lib/validators';
+import BASE_ADDRESS_FRAGMENT from '../BaseAddress.gql';
+import cartMixin from '../../mixins/cartMixin';
+import BaseInput from '../common/form/BaseInput.vue';
+import BaseAddressForm from './BaseAddressForm.vue';
+import BaseAddress from '../common/BaseAddress.vue';
+
+export default {
+  components: {
+    BaseAddress,
+    BaseAddressForm,
+    BaseInput,
+  },
+
+  mixins: [cartMixin],
+
+  data: () => ({
+    me: null,
+    sameAddress: true,
+  }),
+
+  computed: {
+    billingAddress() {
+      return this.me?.activeCart?.billingAddress;
+    },
+
+    shippingAddress() {
+      return this.me?.activeCart?.shippingAddress;
+    },
+  },
+
+  methods: {
+    handleSubmit(diffAddress) {
+      const address = this.sameAddress ? null : diffAddress;
+      return this.setBillingAddress(address)
+        .then(() => this.$router.push({ name: 'cart' })); // change to next step
+    },
+
+    setBillingAddress(address) {
+      return this.updateMyCart([
+        { setBillingAddress: { address } },
+      ]);
+    },
+
+    goToShipping() {
+      this.$router.push({ name: 'checkout' });
+    },
+  },
+
+  apollo: {
+    me: {
+      query: gql`
+        query me {
+          me {
+            activeCart {
+              id
+              version
+              billingAddress {
+                ...BaseAddress
+              }
+              shippingAddress {
+                ...BaseAddress
+              }
+            }
+          }
+        }
+        ${BASE_ADDRESS_FRAGMENT}`,
+    },
+  },
+
+  validations: {
+    sameAddress: { required },
+  },
+};
+</script>
+
+<i18n>
+en:
+  sameAddress: "Same as shipping address"
+  billingInformation: "Billing Information"
+de:
+  sameAddress: "Entspricht die Lieferadresse"
+  billingInformation: "Rechnung Information"
+</i18n>
diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index 859cefb9..104c222a 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -1,148 +1,43 @@
 <template>
-  <form v-if="cartExists"
-        @submit.prevent="submit(setShippingAddress)"
-        id="checkout-shipping-address-form">
-    <div class="shipping-info">
-      <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
-    </div>
-    <div class="address-form shipping-address-form">
-      <div class="row">
-        <div class="col-sm-12">
-          <ServerError :error="serverError"/>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-sm-6">
-          <BaseInput v-model="form.firstName"
-                     :vuelidate="$v.form.firstName"
-                     :label="$t('firstName')"
-                     type="text"
-                     autocomplete="fname"/>
-        </div>
-        <div class="col-sm-6">
-          <BaseInput v-model="form.lastName"
-                     :vuelidate="$v.form.lastName"
-                     :label="$t('lastName')"
-                     type="text"
-                     autocomplete="lname"/>
-        </div>
-        <div class="col-sm-12">
-          <BaseInput v-model="form.streetName"
-                     :vuelidate="$v.form.streetName"
-                     :label="$t('streetName')"
-                     type="text"
-                     autocomplete="shipping street-address"/>
-        </div>
-        <div class="col-sm-12">
-          <BaseInput v-model="form.additionalStreetInfo"
-                     :vuelidate="$v.form.additionalStreetInfo"
-                     :label="$t('additionalStreetInfo')"
-                     type="text"/>
-        </div>
-        <div class="col-sm-3">
-          <BaseInput v-model="form.postalCode"
-                     :vuelidate="$v.form.postalCode"
-                     :label="$t('postalCode')"
-                     type="text"
-                     autocomplete="shipping postal-code"/>
-        </div>
-        <div class="col-sm-4">
-          <BaseInput v-model="form.city"
-                     :vuelidate="$v.form.city"
-                     :label="$t('city')"
-                     type="text"
-                     autocomplete="shipping address-level2"/>
-        </div>
-        <div class="col-sm-5">
-          <BaseSelect v-model="form.country"
-                      :vuelidate="$v.form.country"
-                      :label="$t('country')"
-                      :options="countries"/>
-        </div>
-      </div>
-      <hr>
-      <div class="row">
-        <div class="col-sm-6">
-          <BaseInput v-model="form.phone"
-                     :vuelidate="$v.form.phone"
-                     :label="$t('phone')"
-                     type="text"
-                     autocomplete="tel"/>
-        </div>
-        <div class="col-sm-6">
-          <BaseInput v-model="form.email"
-                     :vuelidate="$v.form.email"
-                     :label="$t('email')"
-                     type="email"
-                     autocomplete="email"/>
-        </div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-sm-6">
-        <div>
-          <LoadingButton :buttonState="buttonState"
-                         type="submit"
-                         id="shipping-continue-checkout-btn-xs"
-                         class="btn text-uppercase checkout-checkout-btn">
-            {{ $t('continue') }}
-          </LoadingButton>
-        </div>
-      </div>
-    </div>
-  </form>
+  <BaseAddressForm v-if="cartExists"
+                   :address="shippingAddress"
+                   :title="$t('shippingInformation')"
+                   :onSubmit="setShippingAddress"
+                   @back="goToCart"/>
 </template>
 
 <script>
 import gql from 'graphql-tag';
-import { required, email } from 'vuelidate/lib/validators';
-import formMixin from '../../mixins/formMixin';
 import cartMixin from '../../mixins/cartMixin';
-import BaseInput from '../common/form/BaseInput.vue';
-import BaseSelect from '../common/form/BaseSelect.vue';
-import LoadingButton from '../common/form/LoadingButton.vue';
-import ServerError from '../common/form/ServerError.vue';
+import BaseAddressForm from './BaseAddressForm.vue';
+import BASE_ADDRESS_FRAGMENT from '../BaseAddress.gql';
 
 export default {
   components: {
-    ServerError,
-    LoadingButton,
-    BaseSelect,
-    BaseInput,
+    BaseAddressForm,
   },
 
-  mixins: [formMixin, cartMixin],
+  mixins: [cartMixin],
 
   data: () => ({
     me: null,
-    form: {},
   }),
 
   computed: {
-    countries() {
-      return [
-        { id: null, name: this.$t('selectCountry') },
-        { id: 'DE', name: 'Deutschland' },
-        { id: 'US', name: 'United States' },
-      ];
+    shippingAddress() {
+      return this.me?.activeCart?.shippingAddress;
     },
   },
 
   methods: {
-    setShippingAddress() {
+    setShippingAddress(address) {
       return this.updateMyCart([
-        { setShippingAddress: { address: this.form } },
-      ]);
+        { setShippingAddress: { address } },
+      ]).then(() => this.$router.push({ name: 'checkout-billing' }));
     },
-  },
 
-  watch: {
-    me(value) {
-      if (value?.activeCart?.shippingAddress) {
-        const { contactInfo, ...address } = value.activeCart.shippingAddress;
-        this.form = { ...contactInfo, ...address };
-        delete this.form.__typename;
-      }
+    goToCart() {
+      return this.$router.push({ name: 'cart' });
     },
   },
 
@@ -155,81 +50,20 @@ export default {
               id
               version
               shippingAddress {
-                firstName
-                lastName
-                streetName
-                additionalStreetInfo
-                postalCode
-                city
-                country
-                contactInfo {
-                  phone
-                  email
-                }
+                ...BaseAddress
               }
             }
           }
-        }`,
-    },
-  },
-
-  validations: {
-    form: {
-      firstName: { required },
-      lastName: { required },
-      streetName: { required },
-      additionalStreetInfo: {},
-      postalCode: { required },
-      city: { required },
-      country: { required },
-      phone: {},
-      email: { required, email },
+        }
+        ${BASE_ADDRESS_FRAGMENT}`,
     },
   },
 };
 </script>
 
-<style lang="scss">
-#checkout-shipping-address-form {
-  margin: 0.5em 1em;
-
-  .selectboxit {
-    background: url('../../assets/img/arrow-67-filled.png') no-repeat 90% 50% #fff;
-    background-size: 12px;
-    border: 1px solid #D6D6D6;
-    border-radius: 1px;
-  }
-  .selectboxit, .selectboxit-options {
-    width: 100% !important;
-  }
-}
-</style>
-
 <i18n>
 en:
   shippingInformation: "Shipping Information"
-  firstName: "First Name"
-  lastName: "Last Name"
-  streetName: "Address"
-  additionalStreetInfo: "Additional address info"
-  city: "City"
-  postalCode: "Postal Code"
-  country: "Country"
-  email: "Email"
-  phone: "Phone"
-  continue: "Continue"
-  selectCountry: "Select country"
 de:
   shippingInformation: "Versand Information"
-  firstName: "Vorname"
-  lastName: "Nachname"
-  streetName: "Straße und Hausnummer"
-  additionalStreetInfo: "Adresszusatz"
-  city: "Stadt"
-  postalCode: "PLZ"
-  country: "Land"
-  email: "E-Mail-Adresse"
-  phone: "Telefon"
-  continue: "Weiter"
-  selectCountry: "Land auswählen"
 </i18n>
diff --git a/src/components/common/cartlike/LineItemInfo.vue b/src/components/common/cartlike/LineItemInfo.vue
index 34b05735..92c6ec3d 100644
--- a/src/components/common/cartlike/LineItemInfo.vue
+++ b/src/components/common/cartlike/LineItemInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="col-sm-3 product-img-col">
+    <div class="col-sm-3 col-xs-4 product-img-col">
       <router-link :to="productRoute(lineItem.productSlug, lineItem.variant.sku)"
                    class="img">
         <img :src="displayedImageUrl(lineItem.variant)"
@@ -8,7 +8,7 @@
              class="img-responsive img">
       </router-link>
     </div>
-    <div class="col-sm-8 product-info-text">
+    <div class="col-sm-8 col-xs-offset-1 col-xs-7 product-info-text">
       <p class="cart-item-name product-title">
         <router-link :to="productRoute(lineItem.productSlug, lineItem.variant.sku)"
                      data-test="cart-line-item-link">
diff --git a/src/components/common/form/BaseForm.vue b/src/components/common/form/BaseForm.vue
new file mode 100644
index 00000000..098e6e34
--- /dev/null
+++ b/src/components/common/form/BaseForm.vue
@@ -0,0 +1,44 @@
+<template>
+  <form @submit.prevent="submit">
+    <slot :error="error"
+          :state="state"/>
+  </form>
+</template>
+
+<script>
+export default {
+  props: {
+    vuelidate: {
+      type: Object,
+      required: true,
+    },
+    onSubmit: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data: () => ({
+    state: null,
+    error: null,
+  }),
+
+  methods: {
+    async submit() {
+      this.vuelidate.$touch();
+      this.error = null;
+      if (!this.vuelidate.$invalid) {
+        this.state = 'loading';
+        await this.onSubmit()
+          .then(() => {
+            this.state = 'success';
+          })
+          .catch((error) => {
+            this.error = error;
+            this.state = null;
+          });
+      }
+    },
+  },
+};
+</script>
diff --git a/src/components/common/form/BaseInput.vue b/src/components/common/form/BaseInput.vue
index 2f9b83af..0a21278d 100644
--- a/src/components/common/form/BaseInput.vue
+++ b/src/components/common/form/BaseInput.vue
@@ -6,13 +6,14 @@
                :type="$attrs.type">
       <input v-model="model"
              v-bind="$attrs"
-             :class="{ 'error': vuelidate.$error }"/>
+             :class="errorClass"/>
     </BaseLabel>
     <input v-else
            v-model="model"
            v-bind="$attrs"
-           :class="{ 'error': vuelidate.$error }"/>
-    <ValidationError :vuelidate="vuelidate"
+           :class="errorClass"/>
+    <ValidationError v-if="vuelidate"
+                     :vuelidate="vuelidate"
                      :customErrors="customErrors"/>
   </span>
 </template>
@@ -36,7 +37,6 @@ export default {
     },
     vuelidate: {
       type: Object,
-      required: true,
     },
     label: {
       type: String,
@@ -47,12 +47,16 @@ export default {
   },
 
   computed: {
+    errorClass() {
+      return { error: this.vuelidate?.$error };
+    },
+
     model: {
       get() {
         return this.value;
       },
       set(value) {
-        this.vuelidate.$touch();
+        if (this.vuelidate) this.vuelidate.$touch();
         this.$emit('input', value);
       },
     },
diff --git a/src/components/common/form/BaseLabel.vue b/src/components/common/form/BaseLabel.vue
index f5c0efdd..ed5d1a28 100644
--- a/src/components/common/form/BaseLabel.vue
+++ b/src/components/common/form/BaseLabel.vue
@@ -17,7 +17,6 @@ export default {
   props: {
     vuelidate: {
       type: Object,
-      required: true,
     },
     label: {
       type: String,
@@ -30,7 +29,7 @@ export default {
 
   computed: {
     required() {
-      return this.vuelidate.$params?.required;
+      return this.vuelidate?.$params?.required;
     },
 
     checkbox() {
diff --git a/src/components/common/form/LoadingButton.vue b/src/components/common/form/LoadingButton.vue
index 9fc88545..c90afc17 100644
--- a/src/components/common/form/LoadingButton.vue
+++ b/src/components/common/form/LoadingButton.vue
@@ -1,10 +1,11 @@
 <template>
-  <button :disabled="state !== null"
-          :class="state">
+  <button type="submit"
+          :disabled="formState !== null"
+          :class="formState">
     <slot></slot>
     <transition name="fade"
                 mode="in-out">
-      <span v-if="state === 'loading'"
+      <span v-if="formState === 'loading'"
             key="loading"
             class="state-layer">
         <img src="../../../assets/img/loading.svg"
@@ -13,7 +14,7 @@
     </transition>
     <transition name="fade"
                 mode="in-out">
-      <span v-if="state === 'success'"
+      <span v-if="formState === 'success'"
             key="success"
             class="state-layer">
         <svg xmlns="http://www.w3.org/2000/svg"
@@ -30,22 +31,22 @@
 <script>
 export default {
   props: {
-    buttonState: {
+    state: {
       type: String,
       validator: value => ['success', 'loading'].includes(value),
     },
   },
 
   data: () => ({
-    state: null,
+    formState: null,
   }),
 
   watch: {
-    buttonState(newState) {
-      this.state = newState;
+    state(newState) {
+      this.formState = newState;
       if (newState === 'success') {
         setTimeout(() => {
-          this.state = null;
+          this.formState = null;
           this.$emit('reset');
         }, 2000);
       }
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index ad49a4f7..05cfe364 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -8,8 +8,10 @@
     <hr class="login-box-hr">
     <div class="login-box-description">{{ $t('description') }}</div>
     <div class="login-box-input-wrapper">
-      <form @submit.prevent="submit(customerSignMeIn)">
-        <ServerError :error="serverError"
+      <BaseForm :vuelidate="$v"
+                :onSubmit="customerSignMeIn"
+                #default="{ error, state }">
+        <ServerError :error="error"
                      v-slot="{ graphQLError }">
           {{ getErrorMessage(graphQLError) }}
         </ServerError>
@@ -45,12 +47,12 @@
             </div>
           </div>
         </div>
-        <LoadingButton :buttonState="buttonState"
+        <LoadingButton :state="state"
                        class="login-box-sign-in-btn"
                        data-test="login-form-submit">
           {{ $t('signIn') }}
         </LoadingButton>
-      </form>
+      </BaseForm>
     </div>
   </div>
 </template>
@@ -59,20 +61,19 @@
 import { required, email } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
 import { clientLogin } from '../../auth';
-import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/form/ServerError.vue';
 import LoadingButton from '../common/form/LoadingButton.vue';
 import BaseInput from '../common/form/BaseInput.vue';
+import BaseForm from '../common/form/BaseForm.vue';
 
 export default {
   components: {
+    BaseForm,
     BaseInput,
     ServerError,
     LoadingButton,
   },
 
-  mixins: [formMixin],
-
   data: () => ({
     form: {
       email: '',
diff --git a/src/components/login/SignUpForm.vue b/src/components/login/SignUpForm.vue
index abba1987..d09036b2 100644
--- a/src/components/login/SignUpForm.vue
+++ b/src/components/login/SignUpForm.vue
@@ -7,8 +7,10 @@
     </div>
     <hr class="signup-box-hr">
     <div class="signup-box-description">{{ $t('description') }}</div>
-    <form @submit.prevent="submit(customerSignMeUp)">
-      <ServerError :error="serverError"
+    <BaseForm :vuelidate="$v"
+              :onSubmit="customerSignMeUp"
+              #default="{ error, state }">
+      <ServerError :error="error"
                    v-slot="{ graphQLError }">
         {{ getErrorMessage(graphQLError) }}
       </ServerError>
@@ -81,12 +83,12 @@
                    autocomplete="off"
                    data-test="signup-form-agreetoterms" />
       </div>
-      <LoadingButton :buttonState="buttonState"
+      <LoadingButton :state="state"
                      class="signup-register-btn"
                      data-test="signup-form-submit">
         {{ $t('registerNow') }}
       </LoadingButton>
-    </form>
+    </BaseForm>
   </div>
 </template>
 
@@ -96,20 +98,19 @@ import {
 } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
 import { clientLogin } from '../../auth';
-import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/form/ServerError.vue';
 import LoadingButton from '../common/form/LoadingButton.vue';
 import BaseInput from '../common/form/BaseInput.vue';
+import BaseForm from '../common/form/BaseForm.vue';
 
 export default {
   components: {
+    BaseForm,
     BaseInput,
     ServerError,
     LoadingButton,
   },
 
-  mixins: [formMixin],
-
   data: () => ({
     form: {
       firstName: '',
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index 5dc50d53..8aa8c2e4 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -1,6 +1,8 @@
 <template>
-  <form @submit.prevent="submit(addLineItem)">
-    <ServerError :error="serverError"/>
+  <BaseForm :vuelidate="$v"
+            :onSubmit="addLineItem"
+            #default="{ error, state }">
+    <ServerError :error="error"/>
     <div class="row select-row">
       <ul class="list-inline">
         <!--{{#each product.attributes}}-->
@@ -22,7 +24,7 @@
                       class="bag-items"/>
         </li>
         <li>
-          <LoadingButton :buttonState="buttonState"
+          <LoadingButton :state="state"
                          data-test="add-to-cart-form-button"
                          class="add-to-bag-btn">
             <img class="bag-thumb"
@@ -33,17 +35,17 @@
         </li>
       </ul>
     </div>
-  </form>
+  </BaseForm>
 </template>
 
 <script>
 import { required, numeric, between } from 'vuelidate/lib/validators';
 import cartMixin from '../../mixins/cartMixin';
 import priceMixin from '../../mixins/priceMixin';
-import formMixin from '../../mixins/formMixin';
 import ServerError from '../common/form/ServerError.vue';
 import LoadingButton from '../common/form/LoadingButton.vue';
 import BaseSelect from '../common/form/BaseSelect.vue';
+import BaseForm from '../common/form/BaseForm.vue';
 
 const MAX_QUANTITY = 10;
 
@@ -56,12 +58,13 @@ export default {
   },
 
   components: {
+    BaseForm,
     BaseSelect,
     LoadingButton,
     ServerError,
   },
 
-  mixins: [cartMixin, priceMixin, formMixin],
+  mixins: [cartMixin, priceMixin],
 
   data: () => ({
     form: {
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index fb8ffe38..88b6f9c6 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -6,12 +6,14 @@
     <div class="personal-details-edit personal-details-edit-show">
       <transition name="fade"
                   mode="out-in">
-        <form v-if="showForm"
-              @submit.prevent="submit(updateCustomerProfile)"
-              id="form-edit-personal-details">
-          <ServerError :error="serverError"
-                       v-slot="{ graphQLError }">
-              {{ getErrorMessage(graphQLError) }}
+        <BaseForm v-if="showForm"
+                  :vuelidate="$v"
+                  :onSubmit="updateCustomerProfile"
+                  #default="{ error, state }"
+                  id="form-edit-personal-details">
+          <ServerError :error="error"
+                       #default="{ graphQLError }">
+            {{ getErrorMessage(graphQLError) }}
           </ServerError>
           <div class="row">
             <div class="col-sm-6">
@@ -57,8 +59,8 @@
           <!-- </div> -->
           <div class="personal-details-edit-btn">
             <span>
-              <LoadingButton :buttonState="buttonState"
-                             :disabled="formIsClean"
+              <LoadingButton :state="state"
+                             :disabled="!$v.$anyDirty"
                              @reset="closeForm"
                              type="submit"
                              class="update-btn"
@@ -73,7 +75,7 @@
               </button>
             </span>
           </div>
-        </form>
+        </BaseForm>
         <div v-else
              class="personal-details-edit-hide">
           <div class="personal-details-box">
@@ -103,20 +105,21 @@
 <script>
 import { required, email } from 'vuelidate/lib/validators';
 import gql from 'graphql-tag';
-import formMixin from '../../../mixins/formMixin';
 import customerMixin from '../../../mixins/customerMixin';
 import ServerError from '../../common/form/ServerError.vue';
 import LoadingButton from '../../common/form/LoadingButton.vue';
 import BaseInput from '../../common/form/BaseInput.vue';
+import BaseForm from '../../common/form/BaseForm.vue';
 
 export default {
   components: {
+    BaseForm,
     BaseInput,
     LoadingButton,
     ServerError,
   },
 
-  mixins: [customerMixin, formMixin],
+  mixins: [customerMixin],
 
   data: () => ({
     me: null,
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index 941bce17..b2881833 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -1,6 +1,7 @@
 import gql from 'graphql-tag';
 import BASIC_CART_QUERY from '../components/BasicCart.gql';
 import DISPLAYABLE_MONEY_FRAGMENT from '../components/DisplayableMoney.gql';
+import BASIC_ADDRESS_FRAGMENT from '../components/BaseAddress.gql';
 
 function cartExists(vm) {
   return vm.me?.activeCart;
@@ -93,9 +94,16 @@ export default {
                   name(locale: $locale)                  
                 }
               }
+              shippingAddress {
+                ...BaseAddress
+              }
+              billingAddress {
+                ...BaseAddress
+              }
             }
           }
-          ${DISPLAYABLE_MONEY_FRAGMENT}`,
+          ${DISPLAYABLE_MONEY_FRAGMENT}
+          ${BASIC_ADDRESS_FRAGMENT}`,
         variables: {
           actions,
           id: this.me.activeCart?.id,
diff --git a/src/mixins/formMixin.js b/src/mixins/formMixin.js
deleted file mode 100644
index 200dfe27..00000000
--- a/src/mixins/formMixin.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export default {
-  data: () => ({
-    buttonState: null,
-    serverError: null,
-  }),
-
-  computed: {
-    formIsClean() {
-      return !this.$v.$anyDirty;
-    },
-  },
-
-  methods: {
-    async submit(onValid) {
-      this.$v.$touch();
-      this.serverError = null;
-      if (!this.$v.$invalid) {
-        this.buttonState = 'loading';
-        await onValid()
-          .then(() => {
-            this.buttonState = 'success';
-          }).catch((error) => {
-            this.serverError = error;
-            this.buttonState = null;
-          });
-      }
-    },
-  },
-};
diff --git a/src/router.js b/src/router.js
index cd699e9b..6706146a 100644
--- a/src/router.js
+++ b/src/router.js
@@ -10,6 +10,8 @@ import PageNotFound from '@/components/common/PageNotFound.vue';
 import PageProductDetail from '@/components/productdetail/PageProductDetail.vue';
 import PageCartDetail from '@/components/cartdetail/PageCartDetail.vue';
 import PageCheckout from '@/components/checkout/PageCheckout.vue';
+import StepShippingAddressForm from '@/components/checkout/StepShippingAddressForm.vue';
+import StepBillingAddressForm from '@/components/checkout/StepBillingAddressForm.vue';
 
 Vue.use(Router);
 
@@ -122,16 +124,18 @@ const router = new Router({
     },
     {
       path: '/checkout',
-      name: 'checkout',
       components: {
         default: PageCheckout,
         header: TheHeader,
       },
-      props: {
-        default: {
-          showStep: 'StepShippingAddressForm',
+      children: [
+        {
+          path: 'billing', name: 'checkout-billing', component: StepBillingAddressForm,
         },
-      },
+        {
+          path: 'shipping', alias: '', name: 'checkout', component: StepShippingAddressForm,
+        },
+      ],
     },
   ],
 });
diff --git a/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js b/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
index ff0a4911..fe9934ab 100644
--- a/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
+++ b/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
@@ -2,8 +2,6 @@ import Vuelidate from 'vuelidate';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import LineItemQuantityForm from '@/components/cartdetail/LineItemQuantityForm.vue';
 
-jest.mock('lodash.debounce', () => jest.fn(fn => fn));
-
 const localVue = createLocalVue();
 localVue.use(Vuelidate);
 
@@ -18,7 +16,7 @@ describe('LineItemQuantityForm.vue', () => {
       localVue,
       propsData: { lineItemId: 'li-id', quantity: 3 },
       computed: { cartExists: () => true },
-      methods: { submit: mockedDebounced },
+      methods: { debouncedSubmit: mockedDebounced },
     };
   });
 
@@ -27,38 +25,29 @@ describe('LineItemQuantityForm.vue', () => {
   });
 
   it('does not submit on created', () => {
-    shallowMount(LineItemQuantityForm, options);
+    const wrapper = shallowMount(LineItemQuantityForm, options);
+    wrapper.setData({ debouncedSubmit: mockedDebounced });
     expect(mockedDebounced).not.toBeCalled();
   });
 
   it('does not submit on same quantity changed', () => {
     const wrapper = shallowMount(LineItemQuantityForm, options);
+    wrapper.setData({ debouncedSubmit: mockedDebounced });
     wrapper.setData({ form: { quantity: 3 } });
     expect(mockedDebounced).not.toBeCalled();
   });
 
   it('submits when quantity changes', () => {
     const wrapper = shallowMount(LineItemQuantityForm, options);
+    wrapper.setData({ debouncedSubmit: mockedDebounced });
     wrapper.setData({ form: { quantity: 8 } });
     expect(mockedDebounced).toBeCalled();
   });
 
   it('does not submit when quantity is wrong', () => {
     const wrapper = shallowMount(LineItemQuantityForm, options);
+    wrapper.setData({ debouncedSubmit: mockedDebounced });
     wrapper.setData({ form: { quantity: 'wrong' } });
     expect(mockedDebounced).not.toBeCalled();
   });
-
-
-  it('submits on increment/decrement buttons clicked', () => {
-    const wrapper = shallowMount(LineItemQuantityForm, options);
-
-    wrapper.find('[data-test="cart-line-item-quantity-inc"]').trigger('click');
-    expect(wrapper.vm.form.quantity).toBe(4);
-    expect(mockedDebounced).toBeCalledTimes(1);
-
-    wrapper.find('[data-test="cart-line-item-quantity-dec"]').trigger('click');
-    expect(wrapper.vm.form.quantity).toBe(3);
-    expect(mockedDebounced).toBeCalledTimes(2);
-  });
 });
diff --git a/tests/unit/specs/components/checkout/BaseAddressForm.spec.js b/tests/unit/specs/components/checkout/BaseAddressForm.spec.js
new file mode 100644
index 00000000..1563b139
--- /dev/null
+++ b/tests/unit/specs/components/checkout/BaseAddressForm.spec.js
@@ -0,0 +1,64 @@
+import Vuelidate from 'vuelidate';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import BaseAddressForm from '@/components/checkout/BaseAddressForm.vue';
+
+const localVue = createLocalVue();
+localVue.use(Vuelidate);
+
+describe('BaseAddressForm.vue', () => {
+  let options;
+
+  beforeEach(() => {
+    options = {
+      localVue,
+      mocks: { $t: jest.fn() },
+      propsData: { address: null },
+    };
+  });
+
+  it('renders a vue instance', () => {
+    expect(shallowMount(BaseAddressForm, options).isVueInstance()).toBeTruthy();
+  });
+
+  it('does not set form when no shipping address defined in cart', () => {
+    const wrapper = shallowMount(BaseAddressForm, options);
+    expect(wrapper.vm.form).toEqual({});
+  });
+
+  it('sets shipping address in form if defined', () => {
+    options.propsData.address = { country: 'DE' };
+    const wrapper = shallowMount(BaseAddressForm, options);
+    expect(wrapper.vm.form).toEqual({ country: 'DE' });
+  });
+
+  it('removes typename from response when copying to form', () => {
+    options.propsData.address = {
+      firstName: 'Willy',
+      country: 'DE',
+      __typename: 'ShippingAddress',
+    };
+    const wrapper = shallowMount(BaseAddressForm, options);
+    expect(wrapper.vm.form).toEqual({
+      firstName: 'Willy',
+      country: 'DE',
+    });
+  });
+
+  it('flatters contact info in form', () => {
+    options.propsData.address = {
+      firstName: 'Willy',
+      country: 'DE',
+      contactInfo: {
+        email: 'foo@example.com',
+        phone: '+1234',
+      },
+    };
+    const wrapper = shallowMount(BaseAddressForm, options);
+    expect(wrapper.vm.form).toEqual({
+      firstName: 'Willy',
+      country: 'DE',
+      email: 'foo@example.com',
+      phone: '+1234',
+    });
+  });
+});
diff --git a/tests/unit/specs/components/checkout/StepShippingAddressForm.spec.js b/tests/unit/specs/components/checkout/StepShippingAddressForm.spec.js
deleted file mode 100644
index 55b08c8b..00000000
--- a/tests/unit/specs/components/checkout/StepShippingAddressForm.spec.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import Vuelidate from 'vuelidate';
-import { shallowMount, createLocalVue } from '@vue/test-utils';
-import StepShippingAddressForm from '@/components/checkout/StepShippingAddressForm.vue';
-
-const localVue = createLocalVue();
-localVue.use(Vuelidate);
-
-describe('StepShippingAddressForm.vue', () => {
-  let options;
-
-  beforeEach(() => {
-    options = {
-      localVue,
-      mocks: { $t: jest.fn() },
-    };
-  });
-
-  it('renders a vue instance', () => {
-    expect(shallowMount(StepShippingAddressForm, options).isVueInstance()).toBeTruthy();
-  });
-
-  it('does not set form when no shipping address defined in cart', () => {
-    const wrapper = shallowMount(StepShippingAddressForm, options);
-    expect(wrapper.vm.form).toEqual({});
-
-    wrapper.setData({ me: { } });
-    expect(wrapper.vm.form).toEqual({});
-
-    wrapper.setData({ me: { activeCart: null } });
-    expect(wrapper.vm.form).toEqual({});
-
-    wrapper.setData({ me: { activeCart: { shippingAddress: null } } });
-    expect(wrapper.vm.form).toEqual({});
-  });
-
-  it('sets shipping address in form if defined', () => {
-    const wrapper = shallowMount(StepShippingAddressForm, options);
-    expect(wrapper.vm.form).toEqual({});
-
-    wrapper.setData({
-      me: {
-        activeCart: {
-          shippingAddress: {
-            country: 'DE',
-          },
-        },
-      },
-    });
-    expect(wrapper.vm.form).toEqual({
-      country: 'DE',
-    });
-  });
-
-  it('removes typename from response when copying to form', () => {
-    const wrapper = shallowMount(StepShippingAddressForm, options);
-    expect(wrapper.vm.form).toEqual({});
-
-    wrapper.setData({
-      me: {
-        activeCart: {
-          shippingAddress: {
-            firstName: 'Willy',
-            country: 'DE',
-            __typename: 'ShippingAddress',
-          },
-        },
-      },
-    });
-    expect(wrapper.vm.form).toEqual({
-      firstName: 'Willy',
-      country: 'DE',
-    });
-  });
-
-  it('flatters contact info in form', () => {
-    const wrapper = shallowMount(StepShippingAddressForm, options);
-    expect(wrapper.vm.form).toEqual({});
-
-    wrapper.setData({
-      me: {
-        activeCart: {
-          shippingAddress: {
-            firstName: 'Willy',
-            country: 'DE',
-            contactInfo: {
-              email: 'foo@example.com',
-              phone: '+1234',
-            },
-          },
-        },
-      },
-    });
-    expect(wrapper.vm.form).toEqual({
-      firstName: 'Willy',
-      country: 'DE',
-      email: 'foo@example.com',
-      phone: '+1234',
-    });
-  });
-});
diff --git a/tests/unit/specs/components/userprofile/EditProfileForm.spec.js b/tests/unit/specs/components/userprofile/EditProfileForm.spec.js
index 1b3b1a81..2a113df2 100644
--- a/tests/unit/specs/components/userprofile/EditProfileForm.spec.js
+++ b/tests/unit/specs/components/userprofile/EditProfileForm.spec.js
@@ -34,24 +34,29 @@ describe('EditProfileForm.vue', () => {
   });
 
   it('displays current form values', () => {
+    options.sync = false;
     const wrapper = shallowMount(EditProfileForm, options);
     wrapper.setData({ me });
-    wrapper.find('[data-test="edit-profile-form-show"]').trigger('click');
-    expect(wrapper.vm.form.firstName).toBe(me.customer.firstName);
-    expect(wrapper.vm.form.lastName).toBe(me.customer.lastName);
-    expect(wrapper.vm.form.email).toBe(me.customer.email);
+    expect(wrapper.vm.form).toEqual({});
+
+    wrapper.vm.openForm();
+    expect(wrapper.vm.form).toEqual(me.customer);
   });
 
   it('re-opens form with initially stored values', () => {
+    options.sync = false;
     const wrapper = shallowMount(EditProfileForm, options);
     wrapper.setData({ me });
-    wrapper.find('[data-test="edit-profile-form-show"]').trigger('click');
+    expect(wrapper.vm.form).toEqual({});
+
+    wrapper.vm.openForm();
+    expect(wrapper.vm.form).toEqual(me.customer);
+
     wrapper.setData({ form: { ...newUser } });
+    expect(wrapper.vm.form).toEqual(newUser);
 
-    wrapper.find('[data-test="edit-profile-form-cancel"]').trigger('click');
-    wrapper.find('[data-test="edit-profile-form-show"]').trigger('click');
-    expect(wrapper.vm.form.firstName).toBe(me.customer.firstName);
-    expect(wrapper.vm.form.lastName).toBe(me.customer.lastName);
-    expect(wrapper.vm.form.email).toBe(me.customer.email);
+    wrapper.vm.closeForm();
+    wrapper.vm.openForm();
+    expect(wrapper.vm.form).toEqual(me.customer);
   });
 });

From 132909c69179df118df79528ba4806721d290fe2 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 16 Jul 2019 17:52:40 +0200
Subject: [PATCH 33/69] Use shortcut for slots

---
 src/components/checkout/StepBillingAddressForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/checkout/StepBillingAddressForm.vue b/src/components/checkout/StepBillingAddressForm.vue
index cef84b43..3eb2e2ed 100644
--- a/src/components/checkout/StepBillingAddressForm.vue
+++ b/src/components/checkout/StepBillingAddressForm.vue
@@ -12,7 +12,7 @@
         </div>
       </div>
       <template v-if="sameAddress"
-                v-slot:fields>
+                #fields>
         <BaseAddress :address="shippingAddress"/>
       </template>
     </BaseAddressForm>

From 45045beeba723c0c1d47781e1a2a360608eaf3a1 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 19 Jul 2019 18:44:20 +0200
Subject: [PATCH 34/69] Fix bug due to merging

---
 src/components/useraccount/SidebarMenu.vue                  | 6 ++++++
 tests/unit/specs/components/common/form/ServerError.spec.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/useraccount/SidebarMenu.vue b/src/components/useraccount/SidebarMenu.vue
index 72edd916..7c504264 100644
--- a/src/components/useraccount/SidebarMenu.vue
+++ b/src/components/useraccount/SidebarMenu.vue
@@ -32,6 +32,12 @@ export default {
   props: ['showTab'],
 
   mixins: [authMixin],
+
+  methods: {
+    isActiveTab(tab) {
+      return this.showTab === tab;
+    },
+  },
 };
 </script>
 
diff --git a/tests/unit/specs/components/common/form/ServerError.spec.js b/tests/unit/specs/components/common/form/ServerError.spec.js
index 05e162fb..01b1cc7b 100644
--- a/tests/unit/specs/components/common/form/ServerError.spec.js
+++ b/tests/unit/specs/components/common/form/ServerError.spec.js
@@ -66,7 +66,7 @@ describe('ServerError.vue', () => {
         networkError: { message: 'Some error', statusCode: 400 },
       }),
     });
-    expect(wrapper.vm.is400Error).toBeTruthy();
+    expect(wrapper.vm.isBadRequestError).toBeTruthy();
   });
 
   it('detects GraphQL errors', () => {

From d629ffe5f03e81950e2ecd7bfb82bc56a6ebaa38 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 23 Jul 2019 14:43:10 +0200
Subject: [PATCH 35/69] Fix my account style by giving its class a unique name

---
 src/assets/scss/_my-account-my-orders-order.scss  | 2 +-
 src/assets/scss/_my-account-personal-details.scss | 2 +-
 src/components/useraccount/PageUserAccount.vue    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/_my-account-my-orders-order.scss b/src/assets/scss/_my-account-my-orders-order.scss
index 86c0f5cf..c514140c 100644
--- a/src/assets/scss/_my-account-my-orders-order.scss
+++ b/src/assets/scss/_my-account-my-orders-order.scss
@@ -35,7 +35,7 @@
 }
 .my-orders-order-dark-box {
   background: $wild-sand;
-  padding: 15px;
+  padding: 15px 10px;
   color: $gray;
   position: relative;
   margin-bottom: 15px;
diff --git a/src/assets/scss/_my-account-personal-details.scss b/src/assets/scss/_my-account-personal-details.scss
index bf321b05..38ddc330 100644
--- 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/useraccount/PageUserAccount.vue b/src/components/useraccount/PageUserAccount.vue
index 44282c50..387253fc 100644
--- a/src/components/useraccount/PageUserAccount.vue
+++ b/src/components/useraccount/PageUserAccount.vue
@@ -6,7 +6,7 @@
       </div>
       <div class="row my-account-content">
         <SidebarMenu class="col-sm-3 col-md-2 col-xs-12 my-account-sidebar"/>
-        <router-view class="col-sm-9 col-md-10 col-xs-12 checkout-form-step"/>
+        <router-view class="col-sm-9 col-md-10 col-xs-12 my-account-tab"/>
       </div>
     </div>
   </div>

From 9ad0110e4552140a64ced3420f74b85fbc781bc3 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 24 Jul 2019 14:39:00 +0200
Subject: [PATCH 36/69] Improve form components in code and style

---
 src/assets/scss/_login-box.scss               |  8 --
 src/components/common/form/BaseInput.vue      | 45 +++------
 src/components/common/form/BaseLabel.vue      | 59 ++++++++----
 src/components/common/form/BaseSelect.vue     | 14 +--
 .../common/form/ValidationError.vue           | 12 +--
 src/components/login/LoginForm.vue            | 44 +++++----
 src/components/login/SignUpForm.vue           | 92 +++++++++----------
 .../userdetail/EditProfileForm.vue            | 49 +++++-----
 8 files changed, 153 insertions(+), 170 deletions(-)

diff --git a/src/assets/scss/_login-box.scss b/src/assets/scss/_login-box.scss
index 5e5d0d5d..4ab203d2 100644
--- a/src/assets/scss/_login-box.scss
+++ b/src/assets/scss/_login-box.scss
@@ -23,14 +23,6 @@
     width: 100%;
   }
 }
-.login-box-input {
-  span {
-    display: inline-block;
-  }
-  input {
-    width: 100%;
-  }
-}
 .login-box-remember-me {
   margin-top: 10px;
   label {
diff --git a/src/components/common/form/BaseInput.vue b/src/components/common/form/BaseInput.vue
index 0a21278d..99ae2483 100644
--- a/src/components/common/form/BaseInput.vue
+++ b/src/components/common/form/BaseInput.vue
@@ -1,34 +1,20 @@
 <template>
-  <span class="form-field">
-    <BaseLabel v-if="label"
-               :vuelidate="vuelidate"
-               :label="label"
-               :type="$attrs.type">
-      <input v-model="model"
-             v-bind="$attrs"
-             :class="errorClass"/>
-    </BaseLabel>
-    <input v-else
-           v-model="model"
+  <BaseLabel :vuelidate="vuelidate"
+             :label="label"
+             :customErrors="customErrors">
+    <input v-model="model"
            v-bind="$attrs"
-           :class="errorClass"/>
-    <ValidationError v-if="vuelidate"
-                     :vuelidate="vuelidate"
-                     :customErrors="customErrors"/>
-  </span>
+           :class="{ 'error': vuelidate.$error }"/>
+  </BaseLabel>
 </template>
 
 <script>
-import ValidationError from './ValidationError.vue';
 import BaseLabel from './BaseLabel.vue';
 
 export default {
   inheritAttrs: false,
 
-  components: {
-    BaseLabel,
-    ValidationError,
-  },
+  components: { BaseLabel },
 
   props: {
     value: {
@@ -47,10 +33,6 @@ export default {
   },
 
   computed: {
-    errorClass() {
-      return { error: this.vuelidate?.$error };
-    },
-
     model: {
       get() {
         return this.value;
@@ -65,12 +47,6 @@ export default {
 </script>
 
 <style scoped>
-.form-field {
-  width: 100%;
-  position: relative;
-  display: inline-block;
-}
-
 input {
   width: 100%;
   border: 1px solid #D6D6D6;
@@ -79,6 +55,13 @@ input {
   margin-top: 0.2em;
 }
 
+input[type=checkbox] {
+  float: left;
+  width: auto;
+  margin-top: 0.3em;
+  margin-right: 10px;
+}
+
 .error {
   border-color: rgba(206, 65, 65, 0.6);
 }
diff --git a/src/components/common/form/BaseLabel.vue b/src/components/common/form/BaseLabel.vue
index ed5d1a28..e155425a 100644
--- a/src/components/common/form/BaseLabel.vue
+++ b/src/components/common/form/BaseLabel.vue
@@ -1,19 +1,34 @@
 <template>
-  <label class="field-label">
-    <slot v-if="checkbox"></slot>
-    <span class="text">{{ label }}</span>
-    <span v-if="required"
-          :title="$t('required')"
-          class="field-required"
-          data-test="form-label-required">
-      *
+  <span>
+    <label v-if="label"
+           class="field-label">
+      <span class="field-label-text">
+        {{ label }}
+        <span v-if="required"
+              :title="$t('required')"
+              class="field-required"
+              data-test="form-label-required">
+          *
+        </span>
+      </span>
+      <slot/>
+    </label>
+    <slot v-else/>
+    <span class="validation-wrapper">
+      <ValidationError v-if="vuelidate"
+                       :vuelidate="vuelidate"
+                       :customErrors="customErrors"
+                       class="validation-error"/>
     </span>
-    <slot v-if="!checkbox"></slot>
-  </label>
+  </span>
 </template>
 
 <script>
+import ValidationError from './ValidationError.vue';
+
 export default {
+  components: { ValidationError },
+
   props: {
     vuelidate: {
       type: Object,
@@ -22,8 +37,8 @@ export default {
       type: String,
       required: true,
     },
-    type: {
-      type: String,
+    customErrors: {
+      type: Object,
     },
   },
 
@@ -31,10 +46,6 @@ export default {
     required() {
       return this.vuelidate?.$params?.required;
     },
-
-    checkbox() {
-      return this.type === 'checkbox';
-    },
   },
 };
 </script>
@@ -43,10 +54,9 @@ export default {
 label {
   width: 100%;
   padding-top: 15px;
-  position: relative;
 }
 
-label .text {
+label .field-label-text {
   text-transform: uppercase;
   font-weight: 400;
 }
@@ -55,6 +65,19 @@ label .text {
   color: #D54D4D;
   cursor: default;
 }
+
+.validation-wrapper {
+  display: block;
+  position: relative;
+}
+
+.validation-error {
+  position: absolute;
+  margin-left: 1px;
+  z-index: 1000;
+  left: 0;
+  bottom: -10px;
+}
 </style>
 
 <i18n>
diff --git a/src/components/common/form/BaseSelect.vue b/src/components/common/form/BaseSelect.vue
index fc266f42..0f9649ae 100644
--- a/src/components/common/form/BaseSelect.vue
+++ b/src/components/common/form/BaseSelect.vue
@@ -1,24 +1,17 @@
 <template>
   <span class="form-field base-select"
         :class="{ 'error': vuelidate.$error }">
-    <BaseLabel v-if="label"
-               :vuelidate="vuelidate"
-               :label="label">
+    <BaseLabel :vuelidate="vuelidate"
+               :label="label"
+               :customErrors="customErrors">
       <SelectBoxIt :options="options"
                    v-model="model"
                    v-bind="$attrs"/>
     </BaseLabel>
-    <SelectBoxIt v-else
-                 :options="options"
-                 v-model="model"
-                 v-bind="$attrs"/>
-    <ValidationError :vuelidate="vuelidate"
-                     :customErrors="customErrors"/>
   </span>
 </template>
 
 <script>
-import ValidationError from './ValidationError.vue';
 import SelectBoxIt from './SelectBoxIt.vue';
 import BaseLabel from './BaseLabel.vue';
 
@@ -28,7 +21,6 @@ export default {
   components: {
     BaseLabel,
     SelectBoxIt,
-    ValidationError,
   },
 
   props: {
diff --git a/src/components/common/form/ValidationError.vue b/src/components/common/form/ValidationError.vue
index 14e216a1..3135fdca 100644
--- a/src/components/common/form/ValidationError.vue
+++ b/src/components/common/form/ValidationError.vue
@@ -6,7 +6,7 @@
       <span v-if="!vuelidate[validation]"
             :validation="validation"
             data-test="validation-error">
-        <span class="form-error-message">
+        <span class="message">
           {{ getErrorMessage(validation) }}
         </span>
       </span>
@@ -46,16 +46,10 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-.form-error-message {
+<style scoped>
+.message {
   font-size: 12px;
-  position: absolute;
-  margin-left: 1px;
-  z-index: 1000;
-  padding: 0;
   color: rgb(206, 65, 65);
-  left: 0;
-  bottom: -10px;
 }
 </style>
 
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index 3a2a0660..af3031c2 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -11,25 +11,33 @@
       <BaseForm :vuelidate="$v"
                 :onSubmit="customerSignMeIn"
                 #default="{ error, state }">
-        <ServerError :error="error"
-                     v-slot="{ graphQLError }">
-          {{ getErrorMessage(graphQLError) }}
-        </ServerError>
-        <div class="login-box-input">
-          <BaseInput v-model="form.email"
-                     :vuelidate="$v.form.email"
-                     :label="$t('email')"
-                     type="email"
-                     autocomplete="username"
-                     data-test="login-form-email" />
+        <div class="row">
+          <div class="col-sm-12">
+            <ServerError :error="error"
+                         v-slot="{ graphQLError }">
+              {{ getErrorMessage(graphQLError) }}
+            </ServerError>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12">
+            <BaseInput v-model="form.email"
+                       :vuelidate="$v.form.email"
+                       :label="$t('email')"
+                       type="email"
+                       autocomplete="username"
+                       data-test="login-form-email" />
+          </div>
         </div>
-        <div class="login-box-input">
-          <BaseInput v-model="form.password"
-                     :vuelidate="$v.form.password"
-                     :label="$t('password')"
-                     type="password"
-                     autocomplete="current-password"
-                     data-test="login-form-password" />
+        <div class="row">
+          <div class="col-sm-12">
+            <BaseInput v-model="form.password"
+                       :vuelidate="$v.form.password"
+                       :label="$t('password')"
+                       type="password"
+                       autocomplete="current-password"
+                       data-test="login-form-password" />
+          </div>
         </div>
         <div class="clearfix">
           <div class="pull-left">
diff --git a/src/components/login/SignUpForm.vue b/src/components/login/SignUpForm.vue
index d7330f70..7a2cfdb0 100644
--- a/src/components/login/SignUpForm.vue
+++ b/src/components/login/SignUpForm.vue
@@ -16,56 +16,50 @@
       </ServerError>
       <div class="row">
         <div class="col-sm-6">
-          <div class="signup-box-input">
-            <BaseInput v-model="form.firstName"
-                       :vuelidate="$v.form.firstName"
-                       :label="$t('firstName')"
-                       type="text"
-                       autocomplete="fname"
-                       data-test="signup-form-firstname" />
-          </div>
+          <BaseInput v-model="form.firstName"
+                     :vuelidate="$v.form.firstName"
+                     :label="$t('firstName')"
+                     type="text"
+                     autocomplete="fname"
+                     data-test="signup-form-firstname" />
         </div>
         <div class="col-sm-6">
-          <div class="signup-box-input">
-            <BaseInput v-model="form.lastName"
-                       :vuelidate="$v.form.lastName"
-                       :label="$t('secondName')"
-                       type="text"
-                       autocomplete="lname"
-                       data-test="signup-form-lastname" />
-          </div>
+          <BaseInput v-model="form.lastName"
+                     :vuelidate="$v.form.lastName"
+                     :label="$t('secondName')"
+                     type="text"
+                     autocomplete="lname"
+                     data-test="signup-form-lastname" />
         </div>
       </div>
       <hr class="signup-box-hr">
-      <div class="signup-box-input">
-        <BaseInput v-model="form.email"
-                   :vuelidate="$v.form.email"
-                   :label="$t('email')"
-                   type="email"
-                   autocomplete="username"
-                   data-test="signup-form-email" />
+      <div class="row">
+        <div class="col-sm-12">
+          <BaseInput v-model="form.email"
+                     :vuelidate="$v.form.email"
+                     :label="$t('email')"
+                     type="email"
+                     autocomplete="username"
+                     data-test="signup-form-email" />
+        </div>
       </div>
       <div class="row">
         <div class="col-sm-6">
-          <div class="signup-box-input">
-            <BaseInput v-model="form.password"
-                       :vuelidate="$v.form.password"
-                       :label="$t('password')"
-                       type="password"
-                       autocomplete="off"
-                       data-test="signup-form-password" />
-          </div>
+          <BaseInput v-model="form.password"
+                     :vuelidate="$v.form.password"
+                     :label="$t('password')"
+                     type="password"
+                     autocomplete="off"
+                     data-test="signup-form-password" />
         </div>
         <div class="col-sm-6">
-          <div class="signup-box-input">
-            <BaseInput v-model="form.repeatPassword"
-                       :vuelidate="$v.form.repeatPassword"
-                       :label="$t('repeatPassword')"
-                       :customErrors="{ sameAsPassword: $t('repeatPasswordError') }"
-                       type="password"
-                       autocomplete="off"
-                       data-test="signup-form-repeatpassword" />
-          </div>
+          <BaseInput v-model="form.repeatPassword"
+                     :vuelidate="$v.form.repeatPassword"
+                     :label="$t('repeatPassword')"
+                     :customErrors="{ sameAsPassword: $t('repeatPasswordError') }"
+                     type="password"
+                     autocomplete="off"
+                     data-test="signup-form-repeatpassword" />
         </div>
       </div>
       <hr class="signup-box-hr">
@@ -74,14 +68,16 @@
       <!--{{#if form.subscribeToNewsletter}}checked{{/if}}>-->
       <!--<span>{{ $t('pleaseAddMe') }} <a href="">{{ $t('newsletter') }}</a></span>-->
       <!--</div>-->
-      <div class="signup-box-terms">
-        <BaseInput v-model="form.agreeToTerms"
-                   :vuelidate="$v.form.agreeToTerms"
-                   :label="$t('agreeTo')"
-                   :customErrors="{ mustBeAgreed: $t('agreeToTermsError') }"
-                   type="checkbox"
-                   autocomplete="off"
-                   data-test="signup-form-agreetoterms" />
+      <div class="row">
+        <div class="col-sm-12">
+          <BaseInput v-model="form.agreeToTerms"
+                     :vuelidate="$v.form.agreeToTerms"
+                     :label="$t('agreeTo')"
+                     :customErrors="{ mustBeAgreed: $t('agreeToTermsError') }"
+                     type="checkbox"
+                     autocomplete="off"
+                     data-test="signup-form-agreetoterms" />
+        </div>
       </div>
       <LoadingButton :state="state"
                      class="signup-register-btn"
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index 88b6f9c6..786648cf 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -17,35 +17,30 @@
           </ServerError>
           <div class="row">
             <div class="col-sm-6">
-              <div class="form-sections">
-                <BaseInput v-model="form.firstName"
-                           :vuelidate="$v.form.firstName"
-                           :label="$t('firstName')"
-                           type="text"
-                           autocomplete="fname"
-                           class="form-inputs"
-                           data-test="edit-profile-form-firstname"/>
-              </div>
-              <div class="form-sections">
-                <BaseInput v-model="form.email"
-                           :vuelidate="$v.form.email"
-                           :label="$t('email')"
-                           type="email"
-                           autocomplete="email"
-                           class="form-inputs"
-                           data-test="edit-profile-form-email"/>
-              </div>
+              <BaseInput v-model="form.firstName"
+                         :vuelidate="$v.form.firstName"
+                         :label="$t('firstName')"
+                         type="text"
+                         autocomplete="fname"
+                         data-test="edit-profile-form-firstname"/>
             </div>
             <div class="col-sm-6">
-              <div class="form-sections">
-                <BaseInput v-model="form.lastName"
-                           :vuelidate="$v.form.lastName"
-                           :label="$t('lastName')"
-                           type="text"
-                           autocomplete="lname"
-                           class="form-inputs"
-                           data-test="edit-profile-form-lastname"/>
-              </div>
+              <BaseInput v-model="form.lastName"
+                         :vuelidate="$v.form.lastName"
+                         :label="$t('lastName')"
+                         type="text"
+                         autocomplete="lname"
+                         data-test="edit-profile-form-lastname"/>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-12">
+              <BaseInput v-model="form.email"
+                         :vuelidate="$v.form.email"
+                         :label="$t('email')"
+                         type="email"
+                         autocomplete="email"
+                         data-test="edit-profile-form-email"/>
             </div>
           </div>
           <hr class="light-grey-hr">

From e4b463695d335dc9404f48e7c6b3943ddf16e869 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 24 Jul 2019 16:49:05 +0200
Subject: [PATCH 37/69] Implement checkout shipping method step

---
 src/components/checkout/BaseAddressForm.vue   |   1 -
 .../checkout/CheckoutNavigation.vue           |   9 +
 .../checkout/StepBillingAddressForm.vue       |   4 +-
 .../checkout/StepShippingMethodForm.vue       | 194 ++++++++++++++++++
 src/components/common/form/BaseInput.vue      |   6 +-
 src/components/common/form/BaseLabel.vue      |   8 +-
 src/components/common/form/BaseRadio.vue      |  59 ++++++
 src/components/common/form/BaseSelect.vue     |   7 +-
 src/mixins/cartMixin.js                       |   5 +
 src/router.js                                 |   6 +-
 10 files changed, 288 insertions(+), 11 deletions(-)
 create mode 100644 src/components/checkout/StepShippingMethodForm.vue
 create mode 100644 src/components/common/form/BaseRadio.vue

diff --git a/src/components/checkout/BaseAddressForm.vue b/src/components/checkout/BaseAddressForm.vue
index e20f5f62..977fcd15 100644
--- a/src/components/checkout/BaseAddressForm.vue
+++ b/src/components/checkout/BaseAddressForm.vue
@@ -126,7 +126,6 @@ export default {
 
   methods: {
     submit() {
-      console.log(this.form);
       return this.onSubmit(this.form);
     },
 
diff --git a/src/components/checkout/CheckoutNavigation.vue b/src/components/checkout/CheckoutNavigation.vue
index 45bdb2a3..8d68ae82 100644
--- a/src/components/checkout/CheckoutNavigation.vue
+++ b/src/components/checkout/CheckoutNavigation.vue
@@ -73,3 +73,12 @@ export default {
   }
 }
 </style>
+
+<i18n>
+en:
+  continue: "Continue"
+  back: "Back"
+de:
+  continue: "Weiter"
+  back: "Zurück"
+</i18n>
diff --git a/src/components/checkout/StepBillingAddressForm.vue b/src/components/checkout/StepBillingAddressForm.vue
index 3eb2e2ed..7e26afae 100644
--- a/src/components/checkout/StepBillingAddressForm.vue
+++ b/src/components/checkout/StepBillingAddressForm.vue
@@ -44,7 +44,7 @@ export default {
 
   computed: {
     billingAddress() {
-      return this.me?.activeCart?.billingAddress;
+      return this.me?.activeCart?.billingAddress || this.shippingAddress;
     },
 
     shippingAddress() {
@@ -56,7 +56,7 @@ export default {
     handleSubmit(diffAddress) {
       const address = this.sameAddress ? null : diffAddress;
       return this.setBillingAddress(address)
-        .then(() => this.$router.push({ name: 'cart' })); // change to next step
+        .then(() => this.$router.push({ name: 'checkout-shipping' }));
     },
 
     setBillingAddress(address) {
diff --git a/src/components/checkout/StepShippingMethodForm.vue b/src/components/checkout/StepShippingMethodForm.vue
new file mode 100644
index 00000000..58fa0426
--- /dev/null
+++ b/src/components/checkout/StepShippingMethodForm.vue
@@ -0,0 +1,194 @@
+<template>
+  <div v-if="cartExists">
+    <BaseForm :vuelidate="$v"
+              :onSubmit="setShippingMethod"
+              #default="{ error, state }">
+      <div class="shipping-info">
+        <span class="text-uppercase shipping-method-title">{{ $t('shippingMethod') }}</span>
+      </div>
+      <div class="row">
+        <div class="col-sm-12">
+          <ServerError :error="error"/>
+        </div>
+      </div>
+      <BaseLabel :label="''"
+                 :vuelidate="$v.form.shippingMethodId">
+        <BaseRadio v-for="shippingMethod in shippingMethodsByLocation"
+                   v-model="form.shippingMethodId"
+                   :value="shippingMethod.id"
+                   :key="shippingMethod.id"
+                   class="shipping-method-option">
+          <span class="shipping-name">
+            {{ shippingMethod.name }}
+            <span class="shipping-description">
+              {{ shippingMethod.description }}
+            </span>
+          </span>
+          <BaseMoney :money="price(shippingMethod)"
+                     class="shipping-price"/>
+        </BaseRadio>
+      </BaseLabel>
+      <CheckoutNavigation :state="state"
+                          @back="goToBilling"/>
+    </BaseForm>
+  </div>
+</template>
+
+<script>
+import gql from 'graphql-tag';
+import { required } from 'vuelidate/lib/validators';
+import DISPLAYABLE_MONEY_FRAGMENT from '../DisplayableMoney.gql';
+import cartMixin from '../../mixins/cartMixin';
+import BaseRadio from '../common/form/BaseRadio.vue';
+import BaseMoney from '../common/BaseMoney.vue';
+import BaseForm from '../common/form/BaseForm.vue';
+import BaseLabel from '../common/form/BaseLabel.vue';
+import ServerError from '../common/form/ServerError.vue';
+import CheckoutNavigation from './CheckoutNavigation.vue';
+
+export default {
+  components: {
+    BaseLabel,
+    CheckoutNavigation,
+    ServerError,
+    BaseForm,
+    BaseMoney,
+    BaseRadio,
+  },
+
+  mixins: [cartMixin],
+
+  data: () => ({
+    form: {
+      shippingMethodId: null,
+    },
+  }),
+
+  methods: {
+    price(shippingMethod) {
+      return shippingMethod.zoneRates
+        .map(zoneRate => zoneRate.shippingRates
+          .find(shippingRate => shippingRate.isMatching))[0]?.price;
+    },
+
+    setShippingMethod() {
+      return this.updateMyCart([
+        {
+          setShippingMethod: {
+            shippingMethod: {
+              typeId: 'shipping-method',
+              id: this.form.shippingMethodId,
+            },
+          },
+        },
+      ]).then(() => this.$router.push({ name: 'cart' }));
+    },
+
+    goToBilling() {
+      this.$router.push({ name: 'checkout-billing' });
+    },
+  },
+
+  watch: {
+    me(value) {
+      this.form.shippingMethodId = value?.activeCart?.shippingInfo?.shippingMethodRef?.id;
+    },
+
+    shippingMethodsByLocation(value) {
+      if (!this.form.shippingMethodId) {
+        this.form.shippingMethodId = value.find(shippingMethod => shippingMethod.isDefault)?.id || value[0]?.id;
+      }
+    },
+  },
+
+  apollo: {
+    me: {
+      query: gql`
+        query me {
+          me {
+            activeCart {
+              id
+              version
+              shippingInfo {
+                shippingMethodRef {
+                  id
+                }
+              }
+              shippingAddress {
+                country
+                state
+              }
+              totalPrice {
+                currencyCode
+              }
+            }
+          }
+        }`,
+    },
+    shippingMethodsByLocation: {
+      query: gql`
+        query checkoutShippingMethods($currency: Currency!, $country: Country!, $state: String) {
+          shippingMethodsByLocation(currency: $currency, country: $country, state: $state) {
+            id
+            name
+            description
+            isDefault
+            zoneRates {
+              shippingRates {
+                isMatching
+                price {
+                  ...DisplayableMoney
+                }
+              }
+            }
+          }
+        }
+        ${DISPLAYABLE_MONEY_FRAGMENT}`,
+      variables() {
+        return {
+          currency: this.me.activeCart.totalPrice.currencyCode,
+          ...this.me.activeCart.shippingAddress,
+        };
+      },
+      skip() {
+        return !this.cartExists;
+      },
+    },
+  },
+
+  validations: {
+    form: {
+      shippingMethodId: { required },
+    },
+  },
+};
+</script>
+
+<style scoped>
+.shipping-method-option {
+  padding: 1.5em;
+  margin: 2px 0;
+}
+
+.shipping-name {
+  text-transform: uppercase;
+  font-weight: 400;
+}
+
+.shipping-description {
+  text-transform: none;
+  padding-left: 1em;
+}
+
+.shipping-price {
+  text-align: right;
+  float: right;
+}
+</style>
+
+<i18n>
+en:
+  shippingMethod: Shipping method
+de:
+  shippingMethod: Versandart
+</i18n>
diff --git a/src/components/common/form/BaseInput.vue b/src/components/common/form/BaseInput.vue
index 99ae2483..1be34488 100644
--- a/src/components/common/form/BaseInput.vue
+++ b/src/components/common/form/BaseInput.vue
@@ -4,7 +4,7 @@
              :customErrors="customErrors">
     <input v-model="model"
            v-bind="$attrs"
-           :class="{ 'error': vuelidate.$error }"/>
+           :class="errorClass"/>
   </BaseLabel>
 </template>
 
@@ -33,6 +33,10 @@ export default {
   },
 
   computed: {
+    errorClass() {
+      return { error: this.vuelidate?.$error };
+    },
+
     model: {
       get() {
         return this.value;
diff --git a/src/components/common/form/BaseLabel.vue b/src/components/common/form/BaseLabel.vue
index e155425a..617f2630 100644
--- a/src/components/common/form/BaseLabel.vue
+++ b/src/components/common/form/BaseLabel.vue
@@ -14,9 +14,9 @@
       <slot/>
     </label>
     <slot v-else/>
-    <span class="validation-wrapper">
-      <ValidationError v-if="vuelidate"
-                       :vuelidate="vuelidate"
+    <span v-if="vuelidate"
+          class="validation-wrapper">
+      <ValidationError :vuelidate="vuelidate"
                        :customErrors="customErrors"
                        class="validation-error"/>
     </span>
@@ -76,7 +76,7 @@ label .field-label-text {
   margin-left: 1px;
   z-index: 1000;
   left: 0;
-  bottom: -10px;
+  bottom: -12px;
 }
 </style>
 
diff --git a/src/components/common/form/BaseRadio.vue b/src/components/common/form/BaseRadio.vue
new file mode 100644
index 00000000..6a91a72c
--- /dev/null
+++ b/src/components/common/form/BaseRadio.vue
@@ -0,0 +1,59 @@
+<template>
+  <label class="field-label">
+    <input v-bind="$attrs"
+           :checked="shouldBeChecked"
+           :value="value"
+           @change="updateInput"
+           type="radio"/>
+    <slot/>
+  </label>
+</template>
+
+<script>
+export default {
+  inheritAttrs: false,
+
+  props: {
+    value: {
+      type: String,
+    },
+    modelValue: {
+      default: '',
+    },
+  },
+
+  model: {
+    prop: 'modelValue',
+    event: 'change',
+  },
+
+  computed: {
+    shouldBeChecked() {
+      return this.modelValue === this.value;
+    },
+  },
+  methods: {
+    updateInput() {
+      this.$emit('change', this.value);
+    },
+  },
+};
+</script>
+
+<style scoped>
+label {
+  width: 100%;
+  margin: 0;
+  padding: 0;
+}
+
+input[type=radio] {
+  float: left;
+  width: auto;
+  border: 1px solid #D6D6D6;
+  border-radius: 1px;
+  padding: 0.5em;
+  margin-top: 0.3em;
+  margin-right: 10px;
+}
+</style>
diff --git a/src/components/common/form/BaseSelect.vue b/src/components/common/form/BaseSelect.vue
index 0f9649ae..0be0f466 100644
--- a/src/components/common/form/BaseSelect.vue
+++ b/src/components/common/form/BaseSelect.vue
@@ -1,6 +1,6 @@
 <template>
   <span class="form-field base-select"
-        :class="{ 'error': vuelidate.$error }">
+        :class="errorClass">
     <BaseLabel :vuelidate="vuelidate"
                :label="label"
                :customErrors="customErrors">
@@ -30,7 +30,6 @@ export default {
     },
     vuelidate: {
       type: Object,
-      required: true,
     },
     options: {
       type: Array,
@@ -45,6 +44,10 @@ export default {
   },
 
   computed: {
+    errorClass() {
+      return { error: this.vuelidate?.$error };
+    },
+
     model: {
       get() {
         return this.value;
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index ee9f02d5..589d6bf9 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -100,6 +100,11 @@ export default {
               billingAddress {
                 ...BaseAddress
               }
+              shippingInfo {
+                shippingMethodRef {
+                  id
+                }
+              }
             }
           }
           ${DISPLAYABLE_MONEY_FRAGMENT}
diff --git a/src/router.js b/src/router.js
index 5112abd8..411f9e03 100644
--- a/src/router.js
+++ b/src/router.js
@@ -16,6 +16,7 @@ import TabOrderDetail from './components/useraccount/myorders/TabOrderDetail.vue
 import PageCheckout from './components/checkout/PageCheckout.vue';
 import StepShippingAddressForm from './components/checkout/StepShippingAddressForm.vue';
 import StepBillingAddressForm from './components/checkout/StepBillingAddressForm.vue';
+import StepShippingMethodForm from './components/checkout/StepShippingMethodForm.vue';
 
 Vue.use(Router);
 
@@ -119,11 +120,14 @@ const router = new Router({
         header: TheHeader,
       },
       children: [
+        {
+          path: 'shipping', name: 'checkout-shipping', component: StepShippingMethodForm,
+        },
         {
           path: 'billing', name: 'checkout-billing', component: StepBillingAddressForm,
         },
         {
-          path: 'shipping', alias: '', name: 'checkout', component: StepShippingAddressForm,
+          path: 'address', alias: '', name: 'checkout', component: StepShippingAddressForm,
         },
       ],
     },

From c474efe6a1a858874afe84ae15706d1ca6b711a0 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 24 Jul 2019 17:21:48 +0200
Subject: [PATCH 38/69] Fix billing address form

---
 src/components/checkout/BaseAddressForm.vue   |  4 --
 .../checkout/StepBillingAddressForm.vue       | 66 +++++++++++--------
 .../checkout/StepShippingAddressForm.vue      | 13 ++--
 3 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/src/components/checkout/BaseAddressForm.vue b/src/components/checkout/BaseAddressForm.vue
index 977fcd15..7dc7cac1 100644
--- a/src/components/checkout/BaseAddressForm.vue
+++ b/src/components/checkout/BaseAddressForm.vue
@@ -3,9 +3,6 @@
             :onSubmit="submit"
             #default="{ error, state }"
             class="checkout-address-form">
-    <div class="shipping-info">
-      <span class="text-uppercase shipping-info-title">{{ title }}</span>
-    </div>
     <div class="address-form shipping-address-form">
       <div class="row">
         <div class="col-sm-12">
@@ -106,7 +103,6 @@ export default {
 
   props: {
     address: Object,
-    title: String,
     onSubmit: Function,
   },
 
diff --git a/src/components/checkout/StepBillingAddressForm.vue b/src/components/checkout/StepBillingAddressForm.vue
index 7e26afae..ccbd2f4d 100644
--- a/src/components/checkout/StepBillingAddressForm.vue
+++ b/src/components/checkout/StepBillingAddressForm.vue
@@ -1,21 +1,32 @@
 <template>
   <div v-if="cartExists">
-    <BaseAddressForm :address="billingAddress"
-                     :title="$t('billingInformation')"
-                     :onSubmit="handleSubmit"
-                     @back="goToShipping">
+    <div class="shipping-info">
+      <span class="text-uppercase shipping-info-title">{{ $t('billingInformation') }}</span>
+    </div>
+    <div class="row">
+      <div class="col-sm-12">
+        <BaseInput v-model="sameAddress"
+                   :label="$t('sameAddress')"
+                   type="checkbox"/>
+      </div>
+    </div>
+    <BaseForm v-if="sameAddress"
+              :vuelidate="$v"
+              :onSubmit="unsetBillingAddress"
+              #default="{ error, state }"
+              class="checkout-address-form">
       <div class="row">
         <div class="col-sm-12">
-          <BaseInput v-model="sameAddress"
-                     :label="$t('sameAddress')"
-                     type="checkbox"/>
+          <ServerError :error="error"/>
         </div>
       </div>
-      <template v-if="sameAddress"
-                #fields>
-        <BaseAddress :address="shippingAddress"/>
-      </template>
-    </BaseAddressForm>
+      <CheckoutNavigation :state="state"
+                          @back="goToShipping"/>
+    </BaseForm>
+    <BaseAddressForm v-else
+                     :address="billingAddress"
+                     :onSubmit="setBillingAddress"
+                     @back="goToShipping"/>
   </div>
 </template>
 
@@ -25,12 +36,16 @@ import { required } from 'vuelidate/lib/validators';
 import BASE_ADDRESS_FRAGMENT from '../BaseAddress.gql';
 import cartMixin from '../../mixins/cartMixin';
 import BaseInput from '../common/form/BaseInput.vue';
+import BaseForm from '../common/form/BaseForm.vue';
 import BaseAddressForm from './BaseAddressForm.vue';
-import BaseAddress from '../common/BaseAddress.vue';
+import ServerError from '../common/form/ServerError.vue';
+import CheckoutNavigation from './CheckoutNavigation.vue';
 
 export default {
   components: {
-    BaseAddress,
+    CheckoutNavigation,
+    ServerError,
+    BaseForm,
     BaseAddressForm,
     BaseInput,
   },
@@ -44,25 +59,19 @@ export default {
 
   computed: {
     billingAddress() {
-      return this.me?.activeCart?.billingAddress || this.shippingAddress;
-    },
-
-    shippingAddress() {
-      return this.me?.activeCart?.shippingAddress;
+      return this.me?.activeCart?.billingAddress;
     },
   },
 
   methods: {
-    handleSubmit(diffAddress) {
-      const address = this.sameAddress ? null : diffAddress;
-      return this.setBillingAddress(address)
-        .then(() => this.$router.push({ name: 'checkout-shipping' }));
+    unsetBillingAddress() {
+      return this.setBillingAddress(null);
     },
 
     setBillingAddress(address) {
       return this.updateMyCart([
         { setBillingAddress: { address } },
-      ]);
+      ]).then(() => this.$router.push({ name: 'checkout-shipping' }));
     },
 
     goToShipping() {
@@ -70,6 +79,12 @@ export default {
     },
   },
 
+  watch: {
+    me(value) {
+      this.sameAddress = !value.activeCart?.billingAddress;
+    },
+  },
+
   apollo: {
     me: {
       query: gql`
@@ -81,9 +96,6 @@ export default {
               billingAddress {
                 ...BaseAddress
               }
-              shippingAddress {
-                ...BaseAddress
-              }
             }
           }
         }
diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index 104c222a..e4ec2d94 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -1,9 +1,12 @@
 <template>
-  <BaseAddressForm v-if="cartExists"
-                   :address="shippingAddress"
-                   :title="$t('shippingInformation')"
-                   :onSubmit="setShippingAddress"
-                   @back="goToCart"/>
+  <div v-if="cartExists">
+    <div class="shipping-info">
+      <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
+    </div>
+    <BaseAddressForm :address="shippingAddress"
+                     :onSubmit="setShippingAddress"
+                     @back="goToCart"/>
+  </div>
 </template>
 
 <script>

From 595052570892278409c72ff6d86077abccfb6ff8 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 24 Jul 2019 17:27:23 +0200
Subject: [PATCH 39/69] Fix styles due to form elements refactoring

---
 src/assets/scss/_cart.scss                         | 2 +-
 src/components/cartdetail/AddDiscountCodeForm.vue  | 2 +-
 src/components/cartdetail/LineItemQuantityForm.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/_cart.scss b/src/assets/scss/_cart.scss
index daac3a7e..b3dda251 100755
--- a/src/assets/scss/_cart.scss
+++ b/src/assets/scss/_cart.scss
@@ -203,7 +203,7 @@
 #promo-code {
   padding: 0.5em;
   width: 300px;
-  margin: 0 1em -1em 0;
+  margin: 0 1em -1em 1em;
   border: 1px solid $alto;
 }
 .promo-apply-btn {
diff --git a/src/components/cartdetail/AddDiscountCodeForm.vue b/src/components/cartdetail/AddDiscountCodeForm.vue
index 17007219..217e9679 100644
--- 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
index 781588c4..01c5f47a 100644
--- a/src/components/cartdetail/LineItemQuantityForm.vue
+++ b/src/components/cartdetail/LineItemQuantityForm.vue
@@ -102,7 +102,7 @@ export default {
     display: inline;
   }
 
-  .form-error-message {
+  .validation-wrapper {
     display: none;
   }
 }

From 2c7b3cacfeaa362b8f32644bc33724a2e31dc612 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 25 Jul 2019 12:05:52 +0200
Subject: [PATCH 40/69] Implement checkout payment step

---
 src/components/checkout/PageCheckout.vue      |  36 ++++++
 .../checkout/StepBillingAddressForm.vue       |   6 +-
 .../checkout/StepPaymentMethodForm.vue        | 110 ++++++++++++++++++
 .../checkout/StepShippingAddressForm.vue      |   6 +-
 .../checkout/StepShippingMethodForm.vue       |  55 +++------
 src/components/common/form/BaseInput.vue      |  12 +-
 src/components/common/form/BaseLabel.vue      |   3 +-
 src/components/common/form/BaseRadio.vue      |   4 +-
 src/components/common/form/BaseSelect.vue     |  12 +-
 src/router.js                                 |   8 +-
 10 files changed, 182 insertions(+), 70 deletions(-)
 create mode 100644 src/components/checkout/StepPaymentMethodForm.vue

diff --git a/src/components/checkout/PageCheckout.vue b/src/components/checkout/PageCheckout.vue
index 552f4358..2f77e875 100644
--- a/src/components/checkout/PageCheckout.vue
+++ b/src/components/checkout/PageCheckout.vue
@@ -74,6 +74,42 @@ export default {
   .selectboxit, .selectboxit-options {
     width: 100% !important;
   }
+
+  .checkout-step-title {
+    margin: 1em 0;
+    padding-bottom: 1em;
+    border-bottom: 1px solid #D6D6D6;
+
+    span {
+      text-transform: uppercase;
+      font-size: 1.1em;
+      letter-spacing: 0.1em;
+      padding-bottom: 1em;
+      margin: 15px 0 20px;
+    }
+  }
+
+  .checkout-form-option {
+    background: lighten(#D6D6D6, 10%);
+    border-radius: 2px;
+    padding: 1.5em;
+    margin: 0.1em 0;
+
+    .option-name {
+      text-transform: uppercase;
+      font-weight: 400;
+    }
+
+    .option-description {
+      text-transform: none;
+      padding-left: 1em;
+    }
+
+    .option-price {
+      text-align: right;
+      float: right;
+    }
+  }
 }
 </style>
 
diff --git a/src/components/checkout/StepBillingAddressForm.vue b/src/components/checkout/StepBillingAddressForm.vue
index ccbd2f4d..758b1c6b 100644
--- a/src/components/checkout/StepBillingAddressForm.vue
+++ b/src/components/checkout/StepBillingAddressForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="cartExists">
-    <div class="shipping-info">
-      <span class="text-uppercase shipping-info-title">{{ $t('billingInformation') }}</span>
+    <div class="checkout-step-title">
+      <span>{{ $t('billingInformation') }}</span>
     </div>
     <div class="row">
       <div class="col-sm-12">
@@ -71,7 +71,7 @@ export default {
     setBillingAddress(address) {
       return this.updateMyCart([
         { setBillingAddress: { address } },
-      ]).then(() => this.$router.push({ name: 'checkout-shipping' }));
+      ]).then(() => this.$router.push({ name: 'checkout-shipping-method' }));
     },
 
     goToShipping() {
diff --git a/src/components/checkout/StepPaymentMethodForm.vue b/src/components/checkout/StepPaymentMethodForm.vue
new file mode 100644
index 00000000..1cf802c9
--- /dev/null
+++ b/src/components/checkout/StepPaymentMethodForm.vue
@@ -0,0 +1,110 @@
+<template>
+  <div v-if="cartExists">
+    <BaseForm :vuelidate="$v"
+              :onSubmit="setPaymentMethod"
+              #default="{ error, state }">
+      <div class="checkout-step-title">
+        <span>{{ $t('paymentMethod') }}</span>
+      </div>
+      <div class="row">
+        <div class="col-sm-12">
+          <ServerError :error="error"/>
+        </div>
+      </div>
+      <BaseLabel :vuelidate="$v.form.paymentMethod">
+        <BaseRadio v-model="form.paymentMethod"
+                   value="card"
+                   class="checkout-form-option">
+          <span class="option-name">
+            {{ $t('creditCard') }}
+            <span class="option-price">
+              <img src="../../assets/img/payment-option-card.gif">
+            </span>
+          </span>
+        </BaseRadio>
+        <BaseRadio v-model="form.paymentMethod"
+                   value="paypal"
+                   class="checkout-form-option">
+          <span class="option-name">
+            PayPal
+            <span class="option-price">
+              <img src="../../assets/img/payment-option-paypal.png">
+            </span>
+          </span>
+        </BaseRadio>
+      </BaseLabel>
+      <CheckoutNavigation :state="state"
+                          @back="goToShippingMethod"/>
+    </BaseForm>
+  </div>
+</template>
+
+<script>
+import { required } from 'vuelidate/lib/validators';
+import cartMixin from '../../mixins/cartMixin';
+import BaseRadio from '../common/form/BaseRadio.vue';
+import BaseForm from '../common/form/BaseForm.vue';
+import BaseLabel from '../common/form/BaseLabel.vue';
+import ServerError from '../common/form/ServerError.vue';
+import CheckoutNavigation from './CheckoutNavigation.vue';
+
+export default {
+  components: {
+    BaseLabel,
+    CheckoutNavigation,
+    ServerError,
+    BaseForm,
+    BaseRadio,
+  },
+
+  mixins: [cartMixin],
+
+  data: () => ({
+    form: {
+      paymentMethod: null,
+    },
+  }),
+
+  methods: {
+    setPaymentMethod() {
+      // TODO create payment and add it to the cart, but missing CreateMyPayment mutation
+      // return this.updateMyCart([
+      //   {
+      //     addPayment: {
+      //       payment: {
+      //         typeId: 'payment',
+      //         id: paymentId
+      //       },
+      //     },
+      //   },
+      // ]).then(() => this.$router.push({ name: 'checkout-confirmation' }));
+      return this.$router.push({ name: 'cart' });
+    },
+
+    goToShippingMethod() {
+      this.$router.push({ name: 'checkout-shipping-method' });
+    },
+  },
+
+  validations: {
+    form: {
+      paymentMethod: { required },
+    },
+  },
+};
+</script>
+
+<style scoped>
+.option-price img {
+  height: 20px;
+}
+</style>
+
+<i18n>
+en:
+  paymentMethod: Payment method
+  creditCard: Credit Card
+de:
+  paymentMethod: Zahlungsart
+  creditCard: Kreditkarte
+</i18n>
diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index e4ec2d94..47d88e68 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="cartExists">
-    <div class="shipping-info">
-      <span class="text-uppercase shipping-info-title">{{ $t('shippingInformation') }}</span>
+    <div class="checkout-step-title">
+      <span>{{ $t('shippingInformation') }}</span>
     </div>
     <BaseAddressForm :address="shippingAddress"
                      :onSubmit="setShippingAddress"
@@ -36,7 +36,7 @@ export default {
     setShippingAddress(address) {
       return this.updateMyCart([
         { setShippingAddress: { address } },
-      ]).then(() => this.$router.push({ name: 'checkout-billing' }));
+      ]).then(() => this.$router.push({ name: 'checkout-billing-address' }));
     },
 
     goToCart() {
diff --git a/src/components/checkout/StepShippingMethodForm.vue b/src/components/checkout/StepShippingMethodForm.vue
index 58fa0426..b0b07405 100644
--- a/src/components/checkout/StepShippingMethodForm.vue
+++ b/src/components/checkout/StepShippingMethodForm.vue
@@ -3,29 +3,28 @@
     <BaseForm :vuelidate="$v"
               :onSubmit="setShippingMethod"
               #default="{ error, state }">
-      <div class="shipping-info">
-        <span class="text-uppercase shipping-method-title">{{ $t('shippingMethod') }}</span>
+      <div class="checkout-step-title">
+        <span>{{ $t('shippingMethod') }}</span>
       </div>
       <div class="row">
         <div class="col-sm-12">
           <ServerError :error="error"/>
         </div>
       </div>
-      <BaseLabel :label="''"
-                 :vuelidate="$v.form.shippingMethodId">
+      <BaseLabel :vuelidate="$v.form.shippingMethod">
         <BaseRadio v-for="shippingMethod in shippingMethodsByLocation"
-                   v-model="form.shippingMethodId"
+                   v-model="form.shippingMethod"
                    :value="shippingMethod.id"
                    :key="shippingMethod.id"
-                   class="shipping-method-option">
-          <span class="shipping-name">
+                   class="checkout-form-option">
+          <span class="option-name">
             {{ shippingMethod.name }}
-            <span class="shipping-description">
+            <span class="option-description">
               {{ shippingMethod.description }}
             </span>
           </span>
           <BaseMoney :money="price(shippingMethod)"
-                     class="shipping-price"/>
+                     class="option-price"/>
         </BaseRadio>
       </BaseLabel>
       <CheckoutNavigation :state="state"
@@ -60,7 +59,7 @@ export default {
 
   data: () => ({
     form: {
-      shippingMethodId: null,
+      shippingMethod: null,
     },
   }),
 
@@ -77,26 +76,26 @@ export default {
           setShippingMethod: {
             shippingMethod: {
               typeId: 'shipping-method',
-              id: this.form.shippingMethodId,
+              id: this.form.shippingMethod,
             },
           },
         },
-      ]).then(() => this.$router.push({ name: 'cart' }));
+      ]).then(() => this.$router.push({ name: 'checkout-payment-method' }));
     },
 
     goToBilling() {
-      this.$router.push({ name: 'checkout-billing' });
+      this.$router.push({ name: 'checkout-billing-address' });
     },
   },
 
   watch: {
     me(value) {
-      this.form.shippingMethodId = value?.activeCart?.shippingInfo?.shippingMethodRef?.id;
+      this.form.shippingMethod = value?.activeCart?.shippingInfo?.shippingMethodRef?.id;
     },
 
     shippingMethodsByLocation(value) {
-      if (!this.form.shippingMethodId) {
-        this.form.shippingMethodId = value.find(shippingMethod => shippingMethod.isDefault)?.id || value[0]?.id;
+      if (!this.form.shippingMethod) {
+        this.form.shippingMethod = value.find(shippingMethod => shippingMethod.isDefault)?.id || value[0]?.id;
       }
     },
   },
@@ -158,34 +157,12 @@ export default {
 
   validations: {
     form: {
-      shippingMethodId: { required },
+      shippingMethod: { required },
     },
   },
 };
 </script>
 
-<style scoped>
-.shipping-method-option {
-  padding: 1.5em;
-  margin: 2px 0;
-}
-
-.shipping-name {
-  text-transform: uppercase;
-  font-weight: 400;
-}
-
-.shipping-description {
-  text-transform: none;
-  padding-left: 1em;
-}
-
-.shipping-price {
-  text-align: right;
-  float: right;
-}
-</style>
-
 <i18n>
 en:
   shippingMethod: Shipping method
diff --git a/src/components/common/form/BaseInput.vue b/src/components/common/form/BaseInput.vue
index 1be34488..46badcf3 100644
--- a/src/components/common/form/BaseInput.vue
+++ b/src/components/common/form/BaseInput.vue
@@ -21,15 +21,9 @@ export default {
       type: [String, Number, Boolean],
       default: null,
     },
-    vuelidate: {
-      type: Object,
-    },
-    label: {
-      type: String,
-    },
-    customErrors: {
-      type: Object,
-    },
+    vuelidate: Object,
+    label: String,
+    customErrors: Object,
   },
 
   computed: {
diff --git a/src/components/common/form/BaseLabel.vue b/src/components/common/form/BaseLabel.vue
index 617f2630..778ae986 100644
--- a/src/components/common/form/BaseLabel.vue
+++ b/src/components/common/form/BaseLabel.vue
@@ -35,7 +35,6 @@ export default {
     },
     label: {
       type: String,
-      required: true,
     },
     customErrors: {
       type: Object,
@@ -76,7 +75,7 @@ label .field-label-text {
   margin-left: 1px;
   z-index: 1000;
   left: 0;
-  bottom: -12px;
+  bottom: -14px;
 }
 </style>
 
diff --git a/src/components/common/form/BaseRadio.vue b/src/components/common/form/BaseRadio.vue
index 6a91a72c..5063898d 100644
--- a/src/components/common/form/BaseRadio.vue
+++ b/src/components/common/form/BaseRadio.vue
@@ -14,9 +14,7 @@ export default {
   inheritAttrs: false,
 
   props: {
-    value: {
-      type: String,
-    },
+    value: String,
     modelValue: {
       default: '',
     },
diff --git a/src/components/common/form/BaseSelect.vue b/src/components/common/form/BaseSelect.vue
index 0be0f466..0dc4a614 100644
--- a/src/components/common/form/BaseSelect.vue
+++ b/src/components/common/form/BaseSelect.vue
@@ -28,19 +28,13 @@ export default {
       type: [String, Number, Boolean],
       default: null,
     },
-    vuelidate: {
-      type: Object,
-    },
+    vuelidate: Object,
     options: {
       type: Array,
       required: true,
     },
-    label: {
-      type: String,
-    },
-    customErrors: {
-      type: Object,
-    },
+    label: String,
+    customErrors: Object,
   },
 
   computed: {
diff --git a/src/router.js b/src/router.js
index 411f9e03..5ebcf3a0 100644
--- a/src/router.js
+++ b/src/router.js
@@ -17,6 +17,7 @@ import PageCheckout from './components/checkout/PageCheckout.vue';
 import StepShippingAddressForm from './components/checkout/StepShippingAddressForm.vue';
 import StepBillingAddressForm from './components/checkout/StepBillingAddressForm.vue';
 import StepShippingMethodForm from './components/checkout/StepShippingMethodForm.vue';
+import StepPaymentMethodForm from './components/checkout/StepPaymentMethodForm.vue';
 
 Vue.use(Router);
 
@@ -121,10 +122,13 @@ const router = new Router({
       },
       children: [
         {
-          path: 'shipping', name: 'checkout-shipping', component: StepShippingMethodForm,
+          path: 'payment', name: 'checkout-payment-method', component: StepPaymentMethodForm,
         },
         {
-          path: 'billing', name: 'checkout-billing', component: StepBillingAddressForm,
+          path: 'shipping', name: 'checkout-shipping-method', component: StepShippingMethodForm,
+        },
+        {
+          path: 'billing', name: 'checkout-billing-address', component: StepBillingAddressForm,
         },
         {
           path: 'address', alias: '', name: 'checkout', component: StepShippingAddressForm,

From 4774fa28b27449d3f843c2eb1a50eaaa380ff22b Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 25 Jul 2019 16:46:55 +0200
Subject: [PATCH 41/69] Implement checkout place order step

---
 src/assets/scss/_checkout-confirmation.scss   |   2 +-
 src/assets/scss/_checkout-shipping.scss       |   6 +-
 .../scss/_my-account-my-orders-order.scss     |   6 +-
 src/components/cartdetail/PageCartDetail.vue  |  27 +--
 src/components/checkout/CartOverview.vue      |   3 +-
 src/components/checkout/CheckoutTitle.vue     |  60 +++++++
 src/components/checkout/PageCheckout.vue      | 116 ++-----------
 .../checkout/StepPaymentMethodForm.vue        |   4 +-
 .../checkout/StepPlaceOrderForm.vue           | 162 ++++++++++++++++++
 src/components/checkout/StepWithOverview.vue  |  18 ++
 src/components/common/BaseAddress.vue         |   4 +-
 ...Summary.vue => CartLikeContentSummary.vue} |  36 ++--
 .../common/cartlike/CartLikeOrderDetail.vue   | 123 +++++++++++++
 .../common/cartlike/CartLikePriceDetail.vue   | 107 ++++++------
 .../common/cartlike/DiscountCodes.vue         |  20 +--
 src/components/common/form/LoadingButton.vue  |   4 +-
 .../useraccount/myorders/ShipmentInfo.vue     | 145 ----------------
 .../useraccount/myorders/TabOrderDetail.vue   |  43 +++--
 src/mixins/cartMixin.js                       |  20 +++
 src/router.js                                 |  27 ++-
 20 files changed, 554 insertions(+), 379 deletions(-)
 create mode 100644 src/components/checkout/CheckoutTitle.vue
 create mode 100644 src/components/checkout/StepPlaceOrderForm.vue
 create mode 100644 src/components/checkout/StepWithOverview.vue
 rename src/components/common/cartlike/{CartLikeSummary.vue => CartLikeContentSummary.vue} (69%)
 create mode 100644 src/components/common/cartlike/CartLikeOrderDetail.vue
 delete mode 100644 src/components/useraccount/myorders/ShipmentInfo.vue

diff --git a/src/assets/scss/_checkout-confirmation.scss b/src/assets/scss/_checkout-confirmation.scss
index fc2b2360..2e2fa573 100755
--- a/src/assets/scss/_checkout-confirmation.scss
+++ b/src/assets/scss/_checkout-confirmation.scss
@@ -94,7 +94,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
index 12c8d2ef..03eef92a 100755
--- a/src/assets/scss/_checkout-shipping.scss
+++ b/src/assets/scss/_checkout-shipping.scss
@@ -51,10 +51,9 @@
 }
 
 // Shipping information
-.checkout {
+.checkout-content {
   background: $white;
   border: 1px solid $alto;
-  margin-bottom: 2em;
 }
 .shipping-info {
   margin: 1em 0;
@@ -149,7 +148,7 @@
 
 // Order summary
 .order-summary {
-  margin: 1em;
+  margin: 1em 0;
 }
 .order-summary-title {
   font-size: 1.1em;
@@ -167,7 +166,6 @@
 .checkout-order {
   background: lighten($alto, 10%);
   border: 1px solid $alto;
-  margin: 1em;
   /**padding-top: 2em;*/
 
   &> div {
diff --git a/src/assets/scss/_my-account-my-orders-order.scss b/src/assets/scss/_my-account-my-orders-order.scss
index c514140c..aee5170d 100644
--- a/src/assets/scss/_my-account-my-orders-order.scss
+++ b/src/assets/scss/_my-account-my-orders-order.scss
@@ -36,14 +36,16 @@
 .my-orders-order-dark-box {
   background: $wild-sand;
   padding: 15px 10px;
-  color: $gray;
   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/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index d25a5ac3..8deac30c 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -14,26 +14,15 @@
           </span>
         </div>
       </div>
-      <div class="col-sm-4">
-        <!--{{> checkout/start-checkout-link id="cart-checkoutnow-btn"}}-->
-      </div>
     </div>
     <div v-if="cartNotEmpty">
       <div class="row">
         <div class="col-sm-12">
           <div class="cart-content">
-            <CartLikeSummary :cart-like="me.activeCart">
-              <template #quantity-column="{ lineItem }">
-                <LineItemDeleteForm :lineItemId="lineItem.id"
-                                    class="col-sm-5 cart-edit-delete"/>
-                <LineItemQuantityForm :lineItemId="lineItem.id"
-                                      :quantity="lineItem.quantity"
-                                      class="col-sm-7 clearfix sm-pull-right"/>
-              </template>
-              <template #before-pricing>
-                <AddDiscountCodeForm/>
-              </template>
-            </CartLikeSummary>
+            <CartLikeContentSummary :cart-like="me.activeCart"
+                                    :editable="true">
+              <AddDiscountCodeForm/>
+            </CartLikeContentSummary>
           </div>
         </div>
       </div>
@@ -63,17 +52,13 @@
 <script>
 import gql from 'graphql-tag';
 import cartMixin from '@/mixins/cartMixin';
-import CartLikeSummary from '../common/cartlike/CartLikeSummary.vue';
-import LineItemDeleteForm from './LineItemDeleteForm.vue';
-import LineItemQuantityForm from './LineItemQuantityForm.vue';
+import CartLikeContentSummary from '../common/cartlike/CartLikeContentSummary.vue';
 import AddDiscountCodeForm from './AddDiscountCodeForm.vue';
 import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
 
 export default {
   components: {
-    CartLikeSummary,
-    LineItemQuantityForm,
-    LineItemDeleteForm,
+    CartLikeContentSummary,
     AddDiscountCodeForm,
   },
 
diff --git a/src/components/checkout/CartOverview.vue b/src/components/checkout/CartOverview.vue
index c85c9bd0..633cfdcb 100644
--- a/src/components/checkout/CartOverview.vue
+++ b/src/components/checkout/CartOverview.vue
@@ -42,7 +42,8 @@
           </div>
         </div>
       </VuePerfectScrollbar>
-      <CartLikePriceDetail :cart-like="me.activeCart"/>
+      <CartLikePriceDetail :cart-like="me.activeCart"
+                           :editable="true"/>
       <div class="row">
         <span class="text-uppercase pull-right edit-quantity-order">
           <router-link :to="{ name: 'cart' }">{{ $t("editMyCart") }}</router-link>
diff --git a/src/components/checkout/CheckoutTitle.vue b/src/components/checkout/CheckoutTitle.vue
new file mode 100644
index 00000000..849ad50b
--- /dev/null
+++ b/src/components/checkout/CheckoutTitle.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="row">
+    <div class="col-md-6">
+      <div class="secure-payment">
+            <span>
+              <img src="../../assets/img/credit-card-lock.png"
+                   class="secure-payment-icon"
+                   :alt="$t('securePayment')">
+            </span>
+        <span class="text-uppercase secure-payment-title">
+              {{ $t("secureCheckout") }}
+            </span>
+      </div>
+    </div>
+    <div class="col-md-6">
+      <div class="checkout-steps text-right">
+        <div :class="activeClass(1)">
+          <span class="step-number">1</span>
+          <span class="text-uppercase step-title">{{ $t("shipping") }}</span>
+        </div>
+        <div :class="activeClass(2)">
+          <span class="step-number">2</span>
+          <span class="text-uppercase step-title">{{ $t("payment") }}</span>
+        </div>
+        <div :class="activeClass(3)">
+          <span class="step-number">3</span>
+          <span class="text-uppercase step-title">{{ $t("confirmation") }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: { step: Number },
+
+  methods: {
+    activeClass(step) {
+      console.log(this.$router.currentRoute);
+      return { active: this.step === step };
+    },
+  },
+};
+</script>
+
+<i18n>
+en:
+  secureCheckout: "Secure Checkout"
+  securePayment: "Secure payment"
+  shipping: "Shipping"
+  payment: "Payment"
+  confirmation: "Confirmation"
+de:
+  secureCheckout: "Sicherer Bestellprozess"
+  securePayment: "Sichere Bezahlung"
+  shipping: "Versand"
+  payment: "Zahlung"
+  confirmation: "Bestätigung"
+</i18n>
diff --git a/src/components/checkout/PageCheckout.vue b/src/components/checkout/PageCheckout.vue
index 2f77e875..83bc92e9 100644
--- a/src/components/checkout/PageCheckout.vue
+++ b/src/components/checkout/PageCheckout.vue
@@ -1,47 +1,11 @@
 <template>
-  <div class="checkout-shipping">
+  <div id="checkout">
     <div class="container">
-      <div class="row">
-        <div class="col-md-6">
-          <div class="secure-payment">
-            <span>
-              <img src="../../assets/img/credit-card-lock.png"
-                   class="secure-payment-icon"
-                   :alt="$t('securePayment')">
-            </span>
-            <span class="text-uppercase secure-payment-title">
-              {{ $t("secureCheckout") }}
-            </span>
-          </div>
-        </div>
-        <div class="col-md-6">
-          <div class="checkout-steps text-right">
-            <div>
-              <span class="step-number">1</span>
-              <span class="text-uppercase step-title">{{ $t("shipping") }}</span>
-            </div>
-            <div>
-              <span class="step-number">2</span>
-              <span class="text-uppercase step-title">{{ $t("payment") }}</span>
-            </div>
-            <div>
-              <span class="step-number">3</span>
-              <span class="text-uppercase step-title">{{ $t("confirmation") }}</span>
-            </div>
-          </div>
-        </div>
-      </div>
+      <CheckoutTitle :step="1"/>
       <div class="row">
         <div class="col-sm-12">
-          <div class="checkout">
-            <div class="row">
-              <div class="col-sm-7">
-                <router-view class="checkout-form-step"/>
-              </div>
-              <div class="col-sm-5">
-                <CartOverview/>
-              </div>
-            </div>
+          <div class="checkout-content">
+            <router-view/>
           </div>
         </div>
       </div>
@@ -50,29 +14,19 @@
 </template>
 
 <script>
-import CartOverview from './CartOverview.vue';
+import CheckoutTitle from './CheckoutTitle.vue';
 
 export default {
   components: {
-    CartOverview,
+    CheckoutTitle,
   },
-
-  props: ['showStep'],
 };
 </script>
 
 <style lang="scss">
-.checkout-form-step {
-  margin: 0.5em 1em;
-
-  .selectboxit {
-    background: url('../../assets/img/arrow-67-filled.png') no-repeat 90% 50% #fff;
-    background-size: 12px;
-    border: 1px solid #D6D6D6;
-    border-radius: 1px;
-  }
-  .selectboxit, .selectboxit-options {
-    width: 100% !important;
+#checkout {
+  .checkout-content {
+    padding: 1em 2em 2em;
   }
 
   .checkout-step-title {
@@ -89,6 +43,16 @@ export default {
     }
   }
 
+  .selectboxit {
+    background: url('../../assets/img/arrow-67-filled.png') no-repeat 90% 50% #fff;
+    background-size: 12px;
+    border: 1px solid #D6D6D6;
+    border-radius: 1px;
+  }
+  .selectboxit, .selectboxit-options {
+    width: 100% !important;
+  }
+
   .checkout-form-option {
     background: lighten(#D6D6D6, 10%);
     border-radius: 2px;
@@ -115,65 +79,23 @@ export default {
 
 <i18n>
 en:
-  secureCheckout: "Secure Checkout"
-  securePayment: "Secure payment"
-  shipping: "Shipping"
-  payment: "Payment"
-  confirmation: "Confirmation"
-
-  completeMyOrder: "Complete My Order"
-  continueCheckout: "Continue Checkout"
-  needHelpCustomerService: "Need help? Customer Service"
   orderDate: "Order Date"
   orderDiscount: "Order Discount"
   orderNumber: "Order Number"
-  paymentInformation: "Payment Details"
   shippingInformation: "Shipping Information"
-  shippingMethod: "Shipping Method"
-  paymentPage:
-  cardName: "Name on credit card"
-  cardNumber: "Credit card number"
-  expiryDateTitle: "Expiry data"
-  paymentOptionsTitle: "Please provide one of the following payment options"
-  securityCode: "Security Code"
-  securityCodeTooltip: "normally you find it on the back of your card"
   thankYouPage:
   title: "Thank you for your order!"
   emailSentToStart: "An email has been sent to"
   emailSentToEnd: "as a copy of this confirmation purchase"
   yourOrderDetails: "Your order details"
-  shippingAddress: "Shipping Address"
-  billingAddress: "Billing Address"
-  differentBillingAddressCheckboxLabel: "Use a different address for billing"
 de:
-  secureCheckout: "Sicherer Bestellprozess"
-  securePayment: "Sichere Bezahlung"
-  shipping: "Versand"
-  payment: "Zahlung"
-  confirmation: "Bestätigung"
-
-  completeMyOrder: "Zahlungspflichtig bestellen"
-  continueCheckout: "Weiter"
-  needHelpCustomerService: "Brauchen Sie Hilfe? Kundenservice"
   orderDate: "Bestelldatum"
   orderDiscount: "Bestelldiscount"
   orderNumber: "Bestellnummer"
-  paymentInformation: "Zahlungsdetails"
   shippingInformation: "Versand Information"
-  shippingMethod: "Versandart"
-  paymentPage:
-  cardName: "Name auf der Kreditkarte"
-  cardNumber: "Kreditkartennummer"
-  expiryDateTitle: "Gültig bis"
-  paymentOptionsTitle: "Bitte wählen Sie eine Zahlungsart aus"
-  securityCode: "Prüfnummer"
-  securityCodeTooltip: "Normalerweise befindet sich der Code auf der Rückseite."
   thankYouPage:
   title: "Vielen Dank für Ihre Bestellung!"
   emailSentToStart: "Eine Email wurde versandt"
   emailSentToEnd: "als Bestellbestätigung."
   yourOrderDetails: "Ihre Bestelldetails"
-  billingAddress: "Zahlungsadresse"
-  shippingAddress: "Versandadresse"
-  differentBillingAddressCheckboxLabel: "Abweichende Adresse als Rechnungsadresse verwenden."
 </i18n>
diff --git a/src/components/checkout/StepPaymentMethodForm.vue b/src/components/checkout/StepPaymentMethodForm.vue
index 1cf802c9..a0eac44b 100644
--- a/src/components/checkout/StepPaymentMethodForm.vue
+++ b/src/components/checkout/StepPaymentMethodForm.vue
@@ -61,7 +61,7 @@ export default {
 
   data: () => ({
     form: {
-      paymentMethod: null,
+      paymentMethod: 'card',
     },
   }),
 
@@ -78,7 +78,7 @@ export default {
       //     },
       //   },
       // ]).then(() => this.$router.push({ name: 'checkout-confirmation' }));
-      return this.$router.push({ name: 'cart' });
+      return this.$router.push({ name: 'checkout-order' });
     },
 
     goToShippingMethod() {
diff --git a/src/components/checkout/StepPlaceOrderForm.vue b/src/components/checkout/StepPlaceOrderForm.vue
new file mode 100644
index 00000000..14adc369
--- /dev/null
+++ b/src/components/checkout/StepPlaceOrderForm.vue
@@ -0,0 +1,162 @@
+<template>
+  <div v-if="cartExists">
+    <BaseForm :vuelidate="$v"
+              :onSubmit="createOrder"
+              #default="{ error, state }">
+      <div class="checkout-step-title">
+        <span>{{ $t('confirmOrder') }}</span>
+      </div>
+      <div class="row">
+        <div class="col-sm-12">
+          <ServerError :error="error"/>
+        </div>
+      </div>
+      <CartLikeOrderDetail :cart-like="me.activeCart"
+                           :editable="true" />
+      <CartLikeContentSummary :cartLike="me.activeCart"/>
+      <div class="complete-order">
+        <LoadingButton :state="state">{{ $t('completeMyOrder') }}</LoadingButton>
+      </div>
+
+
+      <!--<button id="confirmation-completeorder-btn"-->
+      <!--class="btn complete-order-btn">{{ $t('checkout.completeMyOrder') }}</button>-->
+      <!--<br>-->
+      <!--</div>-->
+
+    </BaseForm>
+  </div>
+</template>
+
+<script>
+import gql from 'graphql-tag';
+import BaseForm from '../common/form/BaseForm.vue';
+import cartMixin from '../../mixins/cartMixin';
+import ServerError from '../common/form/ServerError.vue';
+import LoadingButton from '../common/form/LoadingButton.vue';
+import CartLikeOrderDetail from '../common/cartlike/CartLikeOrderDetail.vue';
+import CartLikeContentSummary from '../common/cartlike/CartLikeContentSummary.vue';
+import BASE_ADDRESS_FRAGMENT from '../BaseAddress.gql';
+import DISPLAYABLE_MONEY_FRAGMENT from '../DisplayableMoney.gql';
+
+export default {
+  components: {
+    CartLikeOrderDetail,
+    CartLikeContentSummary,
+    LoadingButton,
+    ServerError,
+    BaseForm,
+  },
+
+  mixins: [cartMixin],
+
+  methods: {
+    createOrder() {
+      return this.createMyOrder(this.me.activeCart)
+        .then(() => this.$router.push({ name: 'cart' }));
+    },
+  },
+
+  apollo: {
+    me: {
+      query: gql`
+        query me($locale: Locale!) {
+          me {
+            activeCart {
+              id
+              version
+              lineItems {
+                id
+                name(locale: $locale)
+                productSlug(locale: $locale)
+                quantity
+                price {
+                  value {
+                    ...DisplayableMoney
+                  }
+                  discounted {
+                    value {
+                      ...DisplayableMoney
+                    }
+                  }
+                }
+                totalPrice {
+                  ...DisplayableMoney
+                }
+                variant {
+                  sku
+                  images {
+                    url
+                  }
+                }
+              }
+              totalPrice {
+               ...DisplayableMoney
+              }
+              shippingInfo {
+                price {
+                  ...DisplayableMoney
+                }
+              }
+              taxedPrice {
+                totalGross {
+                  ...DisplayableMoney
+                }
+                totalNet {
+                  ...DisplayableMoney
+                }
+              }
+              discountCodes {
+                discountCode {
+                  id
+                  code
+                  name(locale: $locale)
+                }
+              }
+              shippingAddress {
+                ...BaseAddress
+              }
+              billingAddress {
+                ...BaseAddress
+              }
+              shippingInfo {
+                shippingMethod {
+                  name
+                  description
+                }
+              }
+            }
+          }
+        }
+        ${DISPLAYABLE_MONEY_FRAGMENT}
+        ${BASE_ADDRESS_FRAGMENT}`,
+      variables() {
+        return {
+          locale: this.$i18n.locale,
+        };
+      },
+    },
+  },
+
+  validations: {
+    form: {},
+  },
+};
+</script>
+
+<i18n>
+en:
+  confirmOrder: "Confirm your order"
+  completeMyOrder: "Complete My Order"
+  shippingAddress: "Shipping Address"
+  billingAddress: "Billing Address"
+  shippingMethod: "Shipping Method"
+  paymentInformation: "Payment Details"
+de:
+  completeMyOrder: "Zahlungspflichtig bestellen"
+  confirmOrder: "Bestätige Ihre Bestellung"
+  billingAddress: "Zahlungsadresse"
+  shippingAddress: "Versandadresse"
+  shippingMethod: "Versandart"
+  paymentInformation: "Zahlungsdetails"
+</i18n>
diff --git a/src/components/checkout/StepWithOverview.vue b/src/components/checkout/StepWithOverview.vue
new file mode 100644
index 00000000..c54fa0f6
--- /dev/null
+++ b/src/components/checkout/StepWithOverview.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="row">
+    <div class="col-sm-7">
+      <router-view class="checkout-form-step"/>
+    </div>
+    <div class="col-sm-5">
+      <CartOverview/>
+    </div>
+  </div>
+</template>
+
+<script>
+import CartOverview from './CartOverview.vue';
+
+export default {
+  components: { CartOverview },
+};
+</script>
diff --git a/src/components/common/BaseAddress.vue b/src/components/common/BaseAddress.vue
index 76169013..a0864a46 100644
--- a/src/components/common/BaseAddress.vue
+++ b/src/components/common/BaseAddress.vue
@@ -7,9 +7,7 @@
     </div>
     <div>{{ address.streetName }} {{ address.streetNumber }}</div>
     <div>{{ address.additionalStreetInfo }}</div>
-    <div>{{ address.city }}</div>
-    <div>{{ address.postalCode }} {{ address.region }}</div>
-    <div>{{ address.country }}</div>
+    <div>{{ address.postalCode }}, {{ address.city }} ({{ address.country }})</div>
     <br>
     <div>{{ address.contactInfo.phone }}</div>
     <div>{{ address.contactInfo.email }}</div>
diff --git a/src/components/common/cartlike/CartLikeSummary.vue b/src/components/common/cartlike/CartLikeContentSummary.vue
similarity index 69%
rename from src/components/common/cartlike/CartLikeSummary.vue
rename to src/components/common/cartlike/CartLikeContentSummary.vue
index 8fbb5a01..10b9e704 100644
--- a/src/components/common/cartlike/CartLikeSummary.vue
+++ b/src/components/common/cartlike/CartLikeContentSummary.vue
@@ -24,16 +24,21 @@
         <LineItemInfo :line-item="lineItem"
                       class="col-sm-4 col-xs-12"/>
         <div class="col-sm-4 col-xs-12">
-          <slot name="quantity-column"
-                :lineItem="lineItem">
-            <div class="col-sm-6 col-sm-offset-6 col-xs-12 text-center quantity-counter">
-              <span class="visible-xs">{{ $t('quantity') }}:</span>
-              <span data-test="cart-line-item-quantity"
-                    class="quantity-number">
-                {{ lineItem.quantity }}
-              </span>
-            </div>
-          </slot>
+          <div v-if="editable">
+            <LineItemDeleteForm :lineItemId="lineItem.id"
+                                class="col-sm-5 cart-edit-delete"/>
+            <LineItemQuantityForm :lineItemId="lineItem.id"
+                                  :quantity="lineItem.quantity"
+                                  class="col-sm-7 clearfix sm-pull-right"/>
+          </div>
+          <div v-else
+               class="col-sm-6 col-sm-offset-6 col-xs-12 text-center quantity-counter">
+            <span class="visible-xs">{{ $t('quantity') }}:</span>
+            <span data-test="cart-line-item-quantity"
+                  class="quantity-number">
+              {{ lineItem.quantity }}
+            </span>
+          </div>
         </div>
         <div>
           <div class="col-sm-2 col-xs-12 sm-pull-right">
@@ -53,10 +58,11 @@
         </div>
       </div>
     </div>
+    <slot/>
     <div class="row">
       <div class="col-sm-12">
-        <slot name="before-pricing"></slot>
         <CartLikePriceDetail :cartLike="cartLike"
+                             :editable="editable"
                              class="total-price-calc"/>
       </div>
     </div>
@@ -68,9 +74,13 @@ import LineItemInfo from './LineItemInfo.vue';
 import CartLikePriceDetail from './CartLikePriceDetail.vue';
 import BasePrice from '../BasePrice.vue';
 import BaseMoney from '../BaseMoney.vue';
+import LineItemQuantityForm from '../../cartdetail/LineItemQuantityForm.vue';
+import LineItemDeleteForm from '../../cartdetail/LineItemDeleteForm.vue';
 
 export default {
   components: {
+    LineItemDeleteForm,
+    LineItemQuantityForm,
     BaseMoney,
     BasePrice,
     CartLikePriceDetail,
@@ -82,6 +92,10 @@ export default {
       type: Object,
       required: true,
     },
+    editable: {
+      type: Boolean,
+      default: false,
+    },
   },
 };
 </script>
diff --git a/src/components/common/cartlike/CartLikeOrderDetail.vue b/src/components/common/cartlike/CartLikeOrderDetail.vue
new file mode 100644
index 00000000..44c3d8e0
--- /dev/null
+++ b/src/components/common/cartlike/CartLikeOrderDetail.vue
@@ -0,0 +1,123 @@
+<template>
+  <div v-if="cartLike">
+    <div class="row">
+      <div class="col-sm-6">
+        <div class="my-orders-order-dark-box">
+          <div class="my-orders-order-dark-box-title">
+            {{ $t('shippingAddress') }}
+            <router-link v-if="editable"
+                         :to="{ name: 'checkout' }"
+                         class="checkout-summary-edit-icon pull-right">
+              <img src="../../../assets/img/edit-1.png" class="checkout-summary-edit-icon"/>
+              {{ $t('edit') }}
+            </router-link>
+          </div>
+          <BaseAddress :address="shippingAddress"/>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div class="my-orders-order-dark-box">
+          <div class="my-orders-order-dark-box-title">
+            {{ $t('billingAddress') }}
+            <router-link v-if="editable"
+                         :to="{ name: 'checkout-billing-address' }"
+                         class="checkout-summary-edit-icon pull-right">
+              <img src="../../../assets/img/edit-1.png" class="checkout-summary-edit-icon"/>
+              {{ $t('edit') }}
+            </router-link>
+          </div>
+          <BaseAddress :address="billingAddress"/>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-6">
+        <div class="my-orders-order-dark-box">
+          <div class="my-orders-order-dark-box-title">
+            {{ $t('shippingMethod') }}
+            <router-link v-if="editable"
+                         :to="{ name: 'checkout-shipping-method' }"
+                         class="checkout-summary-edit-icon pull-right">
+              <img src="../../../assets/img/edit-1.png" class="checkout-summary-edit-icon"/>
+              {{ $t('edit') }}
+            </router-link>
+          </div>
+          <div v-if="shippingMethod">
+            {{ shippingMethod.name }}
+            <span v-if="shippingMethod.description">- {{ shippingMethod.description }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div class="my-orders-order-dark-box">
+          <div class="my-orders-order-dark-box-title">
+            {{ $t('paymentDetails') }}
+            <router-link v-if="editable"
+                         :to="{ name: 'checkout-payment-method' }"
+                         class="checkout-summary-edit-icon pull-right">
+              <img src="../../../assets/img/edit-1.png" class="checkout-summary-edit-icon"/>
+              {{ $t('edit') }}
+            </router-link>
+          </div>
+          <div v-if="payments">
+            <span v-for="payment in payments"
+                  :key="payment.id">
+              {{ payment.paymentMethodInfo.method }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import BaseAddress from '../BaseAddress.vue';
+
+export default {
+  components: { BaseAddress },
+
+  props: {
+    cartLike: {
+      type: Object,
+      required: true,
+    },
+    editable: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  computed: {
+    shippingAddress() {
+      return this.cartLike.shippingAddress;
+    },
+
+    billingAddress() {
+      return this.cartLike.billingAddress || this.shippingAddress;
+    },
+
+    shippingMethod() {
+      return this.cartLike.shippingInfo?.shippingMethod;
+    },
+
+    payments() {
+      return this.cartLike.paymentInfo?.payments;
+    },
+  },
+};
+</script>
+
+<i18n>
+en:
+  shippingAddress: "Shipping address"
+  billingAddress: "Billing address"
+  shippingMethod: "Shipping method"
+  paymentDetails: "Payment details"
+  edit: "Edit"
+de:
+  paymentDetails: "Zahlungsdetails"
+  shippingMethod: "Versandart"
+  shippingAddress: "Lieferanschrift"
+  billingAddress: "Rechnungsadresse"
+  edit: "Bearbeiten"
+</i18n>
diff --git a/src/components/common/cartlike/CartLikePriceDetail.vue b/src/components/common/cartlike/CartLikePriceDetail.vue
index d21651e0..8ed779b7 100644
--- a/src/components/common/cartlike/CartLikePriceDetail.vue
+++ b/src/components/common/cartlike/CartLikePriceDetail.vue
@@ -1,66 +1,54 @@
 <template>
   <div v-if="cartLike"
        class="cart-like-price-detail">
+    <div v-if="discountCodesExist"
+         class="row">
+      <DiscountCodes :cartLike="cartLike"
+                     :editable="editable"
+                     class="col-sm-12"/>
+    </div>
+    <hr>
     <div class="row">
-      <div v-if="discountCodesExist"
-           class="col-sm-12">
-        <DiscountCodes :cartLike="cartLike"/>
-        <hr>
+      <div class="col-sm-7 subtotal">
+        <span class="subtotal-title">{{ $t('subtotal') }}</span>
       </div>
-      <div class="col-sm-7 col-xs-7">
-        <div class="text-right subtotal">
-          <span class="subtotal-title">{{ $t('subtotal') }}</span>
-        </div>
-        <div v-if="cartLike.shippingInfo"
-             class="text-right delivery-info">
-          <span class="delivery-info-title">{{ $t('shipping') }}</span>
-        </div>
-        <hr class="total-divider">
-        <div v-if="taxes"
-             class="text-right">
-          <span>{{ $t('salesTax') }}</span>
-        </div>
-        <div class="text-right">
-          <span class="order-total">{{ $t('total') }}</span>
-        </div>
+      <div class="col-sm-5">
+        <span data-test="cart-subtotal-price">
+          <BaseMoney :money="subtotal"/>
+        </span>
       </div>
-      <div class="col-sm-5 col-xs-5 text-right">
-        <div>
-          <span data-test="cart-subtotal-price">
-            <BaseMoney :money="subtotal"/>
-          </span>
-        </div>
-        <div>
-          <!--<span class="order-discount">{{ cart.discount }}</span>-->
-        </div>
-        <div>
-          <span v-if="cartLike.shippingInfo"
-                data-test="cart-shipping-price">
-            <BaseMoney :money="cartLike.shippingInfo.price"/>
-          </span>
-        </div>
-        <hr>
-        <div>
-          <span v-if="taxes"
-                data-test="cart-taxes-amount">
-            <BaseMoney :money="taxes"/>
-          </span>
-        </div>
-        <div>
-          <span data-test="cart-total-price"
-                class="order-total">
-            <BaseMoney :money="cartLike.totalPrice"/>
-          </span>
-        </div>
+    </div>
+    <div v-if="cartLike.shippingInfo"
+         class="row">
+      <div class="col-sm-7 delivery-info">
+        <span class="delivery-info-title">{{ $t('shipping') }}</span>
+      </div>
+      <div class="col-sm-5">
+        <span data-test="cart-shipping-price">
+          <BaseMoney :money="cartLike.shippingInfo.price"/>
+        </span>
+      </div>
+    </div>
+    <hr class="total-divider">
+    <div v-if="taxes"
+         class="row">
+      <div class="col-sm-7">
+        <span>{{ $t('salesTax') }}</span>
+      </div>
+      <div class="col-sm-5 cart-taxes-amount">
+        <BaseMoney :money="taxes"/>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-7">
+        <span class="order-total">{{ $t('total') }}</span>
+      </div>
+      <div class="col-sm-5">
+        <span data-test="cart-total-price"
+              class="order-total">
+          <BaseMoney :money="cartLike.totalPrice"/>
+        </span>
       </div>
-
-      <!--{{#if checkoutConfirmation}}-->
-      <!--<div class="complete-order">-->
-        <!--<button id="confirmation-completeorder-btn"-->
-          <!--class="btn complete-order-btn">{{ $t('checkout.completeMyOrder') }}</button>-->
-        <!--<br>-->
-      <!--</div>-->
-      <!--{{/if}}-->
     </div>
   </div>
 </template>
@@ -80,6 +68,10 @@ export default {
       type: Object,
       required: true,
     },
+    editable: {
+      type: Boolean,
+      default: false,
+    },
   },
 
   computed: {
@@ -115,7 +107,8 @@ export default {
 <style scoped>
 .cart-like-price-detail {
   border-top: 1px solid #D6D6D6;
-  padding: 1em;
+  padding: 1em 0;
+  text-align: right;
 }
 </style>
 
diff --git a/src/components/common/cartlike/DiscountCodes.vue b/src/components/common/cartlike/DiscountCodes.vue
index d82ee1d6..e591ed8c 100644
--- a/src/components/common/cartlike/DiscountCodes.vue
+++ b/src/components/common/cartlike/DiscountCodes.vue
@@ -1,17 +1,19 @@
 <template>
-  <div class="row text-right">
-    <div class="applied-discounts col-sm-12">
-      {{ $t('appliedDiscounts') }}:
+  <div>
+    <div class="row text-right">
+      <div class="applied-discounts col-sm-12">
+        {{ $t('appliedDiscounts') }}:
+      </div>
     </div>
     <div v-for="discountInfo in cartLike.discountCodes"
          :key='discountInfo.discountCode.id'
-         class="row"
+         class="row text-right"
          data-test="discount-code-list">
       <div class="col-sm-12"
            data-test="discount-code-name">
         <span class="discount-code">{{ discountInfo.discountCode.code }}</span>
         <span v-if="discountInfo.discountCode.name"> ({{ discountInfo.discountCode.name }})</span>
-        <RemoveDiscountCodeForm v-if="isCart"
+        <RemoveDiscountCodeForm v-if="editable"
                                 :codeId='discountInfo.discountCode.id'/>
       </div>
     </div>
@@ -29,11 +31,9 @@ export default {
       type: Object,
       required: true,
     },
-  },
-
-  computed: {
-    isCart() {
-      return this.cartLike.__typename === 'Cart';
+    editable: {
+      type: Boolean,
+      default: false,
     },
   },
 };
diff --git a/src/components/common/form/LoadingButton.vue b/src/components/common/form/LoadingButton.vue
index 6c90e644..dff5f1b6 100644
--- a/src/components/common/form/LoadingButton.vue
+++ b/src/components/common/form/LoadingButton.vue
@@ -1,7 +1,8 @@
 <template>
   <button type="submit"
           :disabled="formState !== null"
-          :class="formState">
+          :class="formState"
+          class="loading-button">
     <slot></slot>
     <transition name="fade"
                 mode="in-out">
@@ -57,7 +58,6 @@ export default {
 
 <style lang="scss" scoped>
 button {
-  margin-right: 15px;
   font-weight: 900;
   background-color: #FFBA27;
   padding: 10px 20px;
diff --git a/src/components/useraccount/myorders/ShipmentInfo.vue b/src/components/useraccount/myorders/ShipmentInfo.vue
deleted file mode 100644
index bc0d1f67..00000000
--- a/src/components/useraccount/myorders/ShipmentInfo.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <div v-if="me">
-    <div class="row">
-      <div class="col-sm-6">
-        <div class="my-orders-order-dark-box">
-          <div class="my-orders-order-dark-box-title">{{ $t('shippingAddress') }}</div>
-          <BaseAddress v-if="me.order.shippingAddress"
-                       :address="me.order.shippingAddress"/>
-        </div>
-      </div>
-      <div class="col-sm-6">
-        <div class="my-orders-order-dark-box">
-          <div class="my-orders-order-dark-box-title">{{ $t('billingAddress') }}</div>
-          <BaseAddress v-if="me.order.billingAddress"
-                       :address="me.order.billingAddress"/>
-        </div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-sm-6">
-        <div class="my-orders-order-dark-box">
-          <div class="my-orders-order-dark-box-title">{{ $t('shippingMethod') }}</div>
-          <div v-if="me.order.shippingInfo">
-            {{ shippingMethod.name }}
-            <span v-if=" shippingMethod.description">
-              - {{ shippingMethod.description }}
-            </span>
-          </div>
-        </div>
-      </div>
-        <div class="col-sm-6">
-          <div class="my-orders-order-dark-box">
-            <div class="my-orders-order-dark-box-title">{{ $t('paymentDetails') }}</div>
-              <div v-if="me.order.paymentInfo">
-                <span v-for="payment in me.order.paymentInfo.payments"
-                      :key="payment.id">
-                  {{ payment.paymentMethodInfo.method }}
-                </span>
-              </div>
-          </div>
-        </div>
-    </div>
-  </div>
-</template>
-<script>
-import gql from 'graphql-tag';
-import BaseAddress from '../../common/BaseAddress.vue';
-
-export default {
-
-  components: { BaseAddress },
-
-  data: () => ({
-    me: null,
-  }),
-
-  computed: {
-    orderNumber() {
-      return this.$route.params.orderNumber;
-    },
-
-    shippingMethod() {
-      return this.me.order.shippingInfo.shippingMethod;
-    },
-  },
-
-  apollo: {
-    me: {
-      query: gql`
-        query orderByOrderNumber($orderNumber: String) {
-          me {
-            order(orderNumber: $orderNumber) {
-              id
-              version
-              orderNumber
-              shippingAddress {
-                title
-                firstName
-                lastName
-                streetName
-                streetNumber
-                additionalStreetInfo
-                city
-                postalCode
-                region
-                country
-                contactInfo {
-                  phone
-                  email
-                }
-              }
-              billingAddress {
-                title
-                firstName
-                lastName
-                streetName
-                streetNumber
-                additionalStreetInfo
-                city
-                postalCode
-                region
-                country
-                contactInfo {
-                  phone
-                  email
-                }
-              }
-              shippingInfo {
-                shippingMethod {
-                  name
-                  description
-                }
-              }
-              paymentInfo {
-                payments {
-                  paymentMethodInfo {
-                    method
-                  }
-                }
-              }
-            }
-          }
-        }`,
-      variables() {
-        return {
-          orderNumber: this.orderNumber,
-        };
-      },
-    },
-  },
-};
-</script>
-
-<i18n>
-en:
-  shippingAddress: "Shipping address"
-  billingAddress: "Billing address"
-  shippingMethod: "Shipping method"
-  paymentDetails: "Payment details"
-de:
-  paymentDetails: "Zahlungsdetails"
-  shippingMethod: "Versandart"
-  shippingAddress: "Lieferanschrift"
-  billingAddress: "Rechnungsadresse"
-</i18n>
diff --git a/src/components/useraccount/myorders/TabOrderDetail.vue b/src/components/useraccount/myorders/TabOrderDetail.vue
index 5f60e794..2dd460ee 100644
--- a/src/components/useraccount/myorders/TabOrderDetail.vue
+++ b/src/components/useraccount/myorders/TabOrderDetail.vue
@@ -27,8 +27,8 @@
             {{ $t('print') }}
           </button>
         </div>
-        <ShipmentInfo />
-        <CartLikeSummary :cart-like="me.order"/>
+        <CartLikeOrderDetail :cart-like="me.order" />
+        <CartLikeContentSummary :cart-like="me.order"/>
       </div>
       <div v-else>
         <h1 class="text-center">{{ $t('notFound') }}</h1>
@@ -39,15 +39,16 @@
 
 <script>
 import gql from 'graphql-tag';
-import ShipmentInfo from './ShipmentInfo.vue';
 import BaseDate from '../../common/BaseDate.vue';
-import CartLikeSummary from '../../common/cartlike/CartLikeSummary.vue';
-import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
+import CartLikeOrderDetail from '../../common/cartlike/CartLikeOrderDetail.vue';
+import CartLikeContentSummary from '../../common/cartlike/CartLikeContentSummary.vue';
+import DISPLAYABLE_MONEY_FRAGMENT from '../../DisplayableMoney.gql';
+import BASE_ADDRESS_FRAGMENT from '../../BaseAddress.gql';
 
 export default {
   components: {
-    CartLikeSummary,
-    ShipmentInfo,
+    CartLikeOrderDetail,
+    CartLikeContentSummary,
     BaseDate,
   },
 
@@ -55,12 +56,6 @@ export default {
     me: null,
   }),
 
-  computed: {
-    orderNumber() {
-      return this.$route.params.orderNumber;
-    },
-  },
-
   apollo: {
     me: {
       query: gql`
@@ -71,10 +66,27 @@ export default {
               version
               orderNumber
               createdAt
+              shippingAddress {
+                ...BaseAddress
+              }
+              billingAddress {
+                ...BaseAddress
+              }
               shippingInfo {
                 price {
                   ...DisplayableMoney
                 }
+                shippingMethod {
+                  name
+                  description
+                }
+              }
+              paymentInfo {
+                payments {
+                  paymentMethodInfo {
+                    method
+                  }
+                }
               }
               taxedPrice {
                 totalGross {
@@ -128,10 +140,11 @@ export default {
             }
           }
         }
-        ${DisplayableMoneyFragment}`,
+        ${DISPLAYABLE_MONEY_FRAGMENT}
+        ${BASE_ADDRESS_FRAGMENT}`,
       variables() {
         return {
-          orderNumber: this.orderNumber,
+          orderNumber: this.$route.params.orderNumber,
           locale: this.$i18n.locale,
         };
       },
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index 589d6bf9..77e189b3 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -135,6 +135,26 @@ export default {
         },
       });
     },
+
+    createMyOrder({ id, version }) {
+      return this.$apollo.mutate({
+        mutation: gql`
+          mutation ($id: String!, $version: Long!) {
+            createMyOrderFromCart(draft: {
+              id: $id,
+              version: $version
+            }) {
+              id
+            }
+          }`,
+        variables: { id, version },
+        update: (store) => {
+          const data = store.readQuery({ query: BASIC_CART_QUERY });
+          data.me.activeCart = null;
+          store.writeQuery({ query: BASIC_CART_QUERY, data });
+        },
+      });
+    },
   },
 
   apollo: {
diff --git a/src/router.js b/src/router.js
index 5ebcf3a0..3da08d5d 100644
--- a/src/router.js
+++ b/src/router.js
@@ -14,10 +14,12 @@ import TabPersonalDetails from './components/useraccount/userdetail/TabPersonalD
 import TabOrderList from './components/useraccount/myorders/TabOrderList.vue';
 import TabOrderDetail from './components/useraccount/myorders/TabOrderDetail.vue';
 import PageCheckout from './components/checkout/PageCheckout.vue';
+import StepWithOverview from './components/checkout/StepWithOverview.vue';
 import StepShippingAddressForm from './components/checkout/StepShippingAddressForm.vue';
 import StepBillingAddressForm from './components/checkout/StepBillingAddressForm.vue';
 import StepShippingMethodForm from './components/checkout/StepShippingMethodForm.vue';
 import StepPaymentMethodForm from './components/checkout/StepPaymentMethodForm.vue';
+import StepPlaceOrderForm from './components/checkout/StepPlaceOrderForm.vue';
 
 Vue.use(Router);
 
@@ -122,16 +124,25 @@ const router = new Router({
       },
       children: [
         {
-          path: 'payment', name: 'checkout-payment-method', component: StepPaymentMethodForm,
+          path: '',
+          component: StepWithOverview,
+          children: [
+            {
+              path: 'payment', name: 'checkout-payment-method', component: StepPaymentMethodForm,
+            },
+            {
+              path: 'shipping', name: 'checkout-shipping-method', component: StepShippingMethodForm,
+            },
+            {
+              path: 'billing', name: 'checkout-billing-address', component: StepBillingAddressForm,
+            },
+            {
+              path: 'address', alias: '', name: 'checkout', component: StepShippingAddressForm,
+            },
+          ],
         },
         {
-          path: 'shipping', name: 'checkout-shipping-method', component: StepShippingMethodForm,
-        },
-        {
-          path: 'billing', name: 'checkout-billing-address', component: StepBillingAddressForm,
-        },
-        {
-          path: 'address', alias: '', name: 'checkout', component: StepShippingAddressForm,
+          path: 'order', name: 'checkout-order', component: StepPlaceOrderForm,
         },
       ],
     },

From fe3da98951e92c8633b28a2800ffd3671a61293f Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 26 Jul 2019 17:57:04 +0200
Subject: [PATCH 42/69] Refactor cart/order components to finish place order
 component

---
 src/assets/scss/_checkout-confirmation.scss   |  10 +-
 .../{BaseAddress.gql => Address.gql}          |   2 +-
 src/components/Cart.gql                       |  63 ++++++++
 .../{DisplayableMoney.gql => Money.gql}       |   2 +-
 src/components/Order.gql                      |  63 ++++++++
 src/components/cartdetail/PageCartDetail.vue  |  76 +++-------
 src/components/checkout/CartOverview.vue      |  59 +-------
 .../checkout/StepBillingAddressForm.vue       |   6 +-
 .../checkout/StepPaymentMethodForm.vue        |   2 +-
 .../checkout/StepPlaceOrderForm.vue           | 143 ++++++------------
 .../checkout/StepShippingAddressForm.vue      |   6 +-
 .../checkout/StepShippingMethodForm.vue       |  26 +++-
 src/components/common/BaseMoney.vue           |  10 +-
 ...tSummary.vue => CartLikeContentDetail.vue} |  10 --
 .../common/cartlike/CartLikePriceDetail.vue   |   2 +-
 ...ikeOrderDetail.vue => CartLikeSummary.vue} |  12 +-
 src/components/header/MiniCart.vue            |  14 +-
 .../useraccount/myorders/TabOrderDetail.vue   |  95 ++----------
 .../useraccount/myorders/TabOrderList.vue     |   6 +-
 src/i18n/de.yaml                              |   5 -
 src/i18n/en.yaml                              |   5 -
 src/{components => mixins}/BasicCart.gql      |   0
 src/{components => mixins}/BasicCustomer.gql  |   0
 src/mixins/cartMixin.js                       | 103 +++----------
 src/mixins/customerMixin.js                   |   2 +-
 25 files changed, 292 insertions(+), 430 deletions(-)
 rename src/components/{BaseAddress.gql => Address.gql} (78%)
 create mode 100644 src/components/Cart.gql
 rename src/components/{DisplayableMoney.gql => Money.gql} (55%)
 create mode 100644 src/components/Order.gql
 rename src/components/common/cartlike/{CartLikeContentSummary.vue => CartLikeContentDetail.vue} (90%)
 rename src/components/common/cartlike/{CartLikeOrderDetail.vue => CartLikeSummary.vue} (90%)
 rename src/{components => mixins}/BasicCart.gql (100%)
 rename src/{components => mixins}/BasicCustomer.gql (100%)

diff --git a/src/assets/scss/_checkout-confirmation.scss b/src/assets/scss/_checkout-confirmation.scss
index 2e2fa573..555720c5 100755
--- 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;
diff --git a/src/components/BaseAddress.gql b/src/components/Address.gql
similarity index 78%
rename from src/components/BaseAddress.gql
rename to src/components/Address.gql
index 57e92df9..dbb398e1 100644
--- a/src/components/BaseAddress.gql
+++ b/src/components/Address.gql
@@ -1,4 +1,4 @@
-fragment BaseAddress on Address {
+fragment AddressFields on Address {
   firstName
   lastName
   streetName
diff --git a/src/components/Cart.gql b/src/components/Cart.gql
new file mode 100644
index 00000000..b4e695cb
--- /dev/null
+++ b/src/components/Cart.gql
@@ -0,0 +1,63 @@
+fragment CartFields on Cart {
+  id
+  version
+  lineItems {
+    id
+    name(locale: $locale)
+    productSlug(locale: $locale)
+    quantity
+    price {
+      value {
+        ...MoneyFields
+      }
+      discounted {
+        value {
+          ...MoneyFields
+        }
+      }
+    }
+    totalPrice {
+      ...MoneyFields
+    }
+    variant {
+      sku
+      images {
+        url
+      }
+    }
+  }
+  totalPrice {
+    ...MoneyFields
+  }
+  shippingInfo {
+    shippingMethod {
+      id
+      name
+      description
+    }
+    price {
+      ...MoneyFields
+    }
+  }
+  taxedPrice {
+    totalGross {
+      ...MoneyFields
+    }
+    totalNet {
+      ...MoneyFields
+    }
+  }
+  discountCodes {
+    discountCode {
+      id
+      code
+      name(locale: $locale)
+    }
+  }
+  shippingAddress {
+    ...AddressFields
+  }
+  billingAddress {
+    ...AddressFields
+  }
+}
\ No newline at end of file
diff --git a/src/components/DisplayableMoney.gql b/src/components/Money.gql
similarity index 55%
rename from src/components/DisplayableMoney.gql
rename to src/components/Money.gql
index 411aae3b..0ee45be9 100644
--- a/src/components/DisplayableMoney.gql
+++ b/src/components/Money.gql
@@ -1,4 +1,4 @@
-fragment DisplayableMoney on Money {
+fragment MoneyFields on Money {
   centAmount
   currencyCode
   fractionDigits
diff --git a/src/components/Order.gql b/src/components/Order.gql
new file mode 100644
index 00000000..7ea295d2
--- /dev/null
+++ b/src/components/Order.gql
@@ -0,0 +1,63 @@
+fragment OrderFields on Order {
+  id
+  orderNumber
+  createdAt
+  lineItems {
+    id
+    name(locale: $locale)
+    productSlug(locale: $locale)
+    quantity
+    price {
+      value {
+        ...MoneyFields
+      }
+      discounted {
+        value {
+          ...MoneyFields
+        }
+      }
+    }
+    totalPrice {
+      ...MoneyFields
+    }
+    variant {
+      sku
+      images {
+        url
+      }
+    }
+  }
+  totalPrice {
+    ...MoneyFields
+  }
+  shippingInfo {
+    shippingMethod {
+      name
+      description
+    }
+    price {
+      ...MoneyFields
+    }
+  }
+  taxedPrice {
+    totalGross {
+      ...MoneyFields
+    }
+    totalNet {
+      ...MoneyFields
+    }
+  }
+  discountCodes {
+    discountCode {
+      id
+      code
+      name(locale: $locale)
+    }
+  }
+  shippingAddress {
+    ...AddressFields
+  }
+  billingAddress {
+    ...AddressFields
+  }
+}
\ No newline at end of file
diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index 8deac30c..2ac13dc0 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -19,10 +19,12 @@
       <div class="row">
         <div class="col-sm-12">
           <div class="cart-content">
-            <CartLikeContentSummary :cart-like="me.activeCart"
-                                    :editable="true">
-              <AddDiscountCodeForm/>
-            </CartLikeContentSummary>
+            <CartLikeContentDetail :cartLike="me.activeCart"
+                                   :editable="true"/>
+            <AddDiscountCodeForm/>
+            <CartLikePriceDetail :cartLike="me.activeCart"
+                                 :editable="true"
+                                 class="total-price-calc"/>
           </div>
         </div>
       </div>
@@ -51,14 +53,18 @@
 
 <script>
 import gql from 'graphql-tag';
-import cartMixin from '@/mixins/cartMixin';
-import CartLikeContentSummary from '../common/cartlike/CartLikeContentSummary.vue';
+import cartMixin from '../../mixins/cartMixin';
+import CartLikeContentDetail from '../common/cartlike/CartLikeContentDetail.vue';
+import CartLikePriceDetail from '../common/cartlike/CartLikePriceDetail.vue';
 import AddDiscountCodeForm from './AddDiscountCodeForm.vue';
-import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
+import CART_FRAGMENT from '../Cart.gql';
+import ADDRESS_FRAGMENT from '../Address.gql';
+import MONEY_FRAGMENT from '../Money.gql';
 
 export default {
   components: {
-    CartLikeContentSummary,
+    CartLikeContentDetail,
+    CartLikePriceDetail,
     AddDiscountCodeForm,
   },
 
@@ -74,59 +80,13 @@ export default {
         query me($locale: Locale!) {
           me {
             activeCart {
-              id
-              lineItems {
-                id
-                name(locale: $locale)
-                productSlug(locale: $locale)
-                quantity
-                price {
-                  value {
-                    ...DisplayableMoney
-                  }
-                  discounted {
-                    value {
-                      ...DisplayableMoney
-                    }
-                  }
-                }
-                totalPrice {
-                  ...DisplayableMoney
-                }
-                variant {
-                  sku
-                  images {
-                    url
-                  }
-                }
-              }
-              totalPrice {
-               ...DisplayableMoney
-              }
-              shippingInfo {
-                price {
-                  ...DisplayableMoney
-                }
-              }
-              taxedPrice {
-                totalGross {
-                  ...DisplayableMoney
-                }
-                totalNet {
-                  ...DisplayableMoney
-                }
-              }
-              discountCodes {
-                discountCode {
-                  id
-                  code
-                  name(locale: $locale)
-                }
-              }
+              ...CartFields
             }
           }
         }
-        ${DisplayableMoneyFragment}`,
+        ${CART_FRAGMENT}
+        ${MONEY_FRAGMENT}
+        ${ADDRESS_FRAGMENT}`,
       variables() {
         return {
           locale: this.$i18n.locale,
diff --git a/src/components/checkout/CartOverview.vue b/src/components/checkout/CartOverview.vue
index 633cfdcb..f15acb39 100644
--- a/src/components/checkout/CartOverview.vue
+++ b/src/components/checkout/CartOverview.vue
@@ -60,9 +60,11 @@ import BasePrice from '../common/BasePrice.vue';
 import BaseMoney from '../common/BaseMoney.vue';
 import productMixin from '../../mixins/productMixin';
 import cartMixin from '../../mixins/cartMixin';
-import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
 import CartLikePriceDetail from '../common/cartlike/CartLikePriceDetail.vue';
 import LineItemInfo from '../common/cartlike/LineItemInfo.vue';
+import CART_FRAGMENT from '../Cart.gql';
+import MONEY_FRAGMENT from '../Money.gql';
+import ADDRESS_FRAGMENT from '../Address.gql';
 
 export default {
   components: {
@@ -85,60 +87,13 @@ export default {
         query me($locale: Locale!) {
           me {
             activeCart {
-              id
-              version
-              lineItems {
-                id
-                quantity
-                name(locale: $locale)
-                productSlug(locale: $locale)
-                variant {
-                  sku
-                  images {
-                    url
-                  }
-                }
-                price {
-                  value {
-                    ...DisplayableMoney
-                  }
-                  discounted {
-                    value {
-                      ...DisplayableMoney
-                    }
-                  }
-                }
-                totalPrice {
-                  ...DisplayableMoney
-                }
-              }
-              totalPrice {
-                ...DisplayableMoney
-              }
-              shippingInfo {
-                price {
-                  ...DisplayableMoney
-                }
-              }
-              taxedPrice {
-                totalGross {
-                  ...DisplayableMoney
-                }
-                totalNet {
-                  ...DisplayableMoney
-                }
-              }
-              discountCodes {
-                discountCode {
-                  id
-                  code
-                  name(locale: $locale)
-                }
-              }
+              ...CartFields
             }
           }
         }
-        ${DisplayableMoneyFragment}`,
+        ${CART_FRAGMENT}
+        ${MONEY_FRAGMENT}
+        ${ADDRESS_FRAGMENT}`,
       variables() {
         return {
           locale: this.$i18n.locale,
diff --git a/src/components/checkout/StepBillingAddressForm.vue b/src/components/checkout/StepBillingAddressForm.vue
index 758b1c6b..7d89d10b 100644
--- a/src/components/checkout/StepBillingAddressForm.vue
+++ b/src/components/checkout/StepBillingAddressForm.vue
@@ -33,13 +33,13 @@
 <script>
 import gql from 'graphql-tag';
 import { required } from 'vuelidate/lib/validators';
-import BASE_ADDRESS_FRAGMENT from '../BaseAddress.gql';
 import cartMixin from '../../mixins/cartMixin';
 import BaseInput from '../common/form/BaseInput.vue';
 import BaseForm from '../common/form/BaseForm.vue';
 import BaseAddressForm from './BaseAddressForm.vue';
 import ServerError from '../common/form/ServerError.vue';
 import CheckoutNavigation from './CheckoutNavigation.vue';
+import ADDRESS_FRAGMENT from '../Address.gql';
 
 export default {
   components: {
@@ -94,12 +94,12 @@ export default {
               id
               version
               billingAddress {
-                ...BaseAddress
+                ...AddressFields
               }
             }
           }
         }
-        ${BASE_ADDRESS_FRAGMENT}`,
+        ${ADDRESS_FRAGMENT}`,
     },
   },
 
diff --git a/src/components/checkout/StepPaymentMethodForm.vue b/src/components/checkout/StepPaymentMethodForm.vue
index a0eac44b..acd86e17 100644
--- a/src/components/checkout/StepPaymentMethodForm.vue
+++ b/src/components/checkout/StepPaymentMethodForm.vue
@@ -78,7 +78,7 @@ export default {
       //     },
       //   },
       // ]).then(() => this.$router.push({ name: 'checkout-confirmation' }));
-      return this.$router.push({ name: 'checkout-order' });
+      return Promise.resolve(this.$router.push({ name: 'checkout-order' }));
     },
 
     goToShippingMethod() {
diff --git a/src/components/checkout/StepPlaceOrderForm.vue b/src/components/checkout/StepPlaceOrderForm.vue
index 14adc369..94d62641 100644
--- a/src/components/checkout/StepPlaceOrderForm.vue
+++ b/src/components/checkout/StepPlaceOrderForm.vue
@@ -1,6 +1,16 @@
 <template>
-  <div v-if="cartExists">
-    <BaseForm :vuelidate="$v"
+  <div>
+    <div v-if="order">
+      <div class="row thank-you">
+        <div class="col-sm-12">{{ $t('thankYou') }}</div>
+      </div>
+      <div class="checkout-step-title">
+        <span>{{ $t('yourOrder') }}</span>
+      </div>
+      <CartLikeSummary :cartLike="order"/>
+    </div>
+    <BaseForm v-else-if="cartExists"
+              :vuelidate="$v"
               :onSubmit="createOrder"
               #default="{ error, state }">
       <div class="checkout-step-title">
@@ -11,19 +21,14 @@
           <ServerError :error="error"/>
         </div>
       </div>
-      <CartLikeOrderDetail :cart-like="me.activeCart"
-                           :editable="true" />
-      <CartLikeContentSummary :cartLike="me.activeCart"/>
+      <CartLikeSummary :cart-like="me.activeCart"
+                       :editable="true" />
       <div class="complete-order">
-        <LoadingButton :state="state">{{ $t('completeMyOrder') }}</LoadingButton>
+        <LoadingButton :state="state"
+                       class="complete-order-btn">
+          {{ $t('completeMyOrder') }}
+        </LoadingButton>
       </div>
-
-
-      <!--<button id="confirmation-completeorder-btn"-->
-      <!--class="btn complete-order-btn">{{ $t('checkout.completeMyOrder') }}</button>-->
-      <!--<br>-->
-      <!--</div>-->
-
     </BaseForm>
   </div>
 </template>
@@ -34,15 +39,14 @@ import BaseForm from '../common/form/BaseForm.vue';
 import cartMixin from '../../mixins/cartMixin';
 import ServerError from '../common/form/ServerError.vue';
 import LoadingButton from '../common/form/LoadingButton.vue';
-import CartLikeOrderDetail from '../common/cartlike/CartLikeOrderDetail.vue';
-import CartLikeContentSummary from '../common/cartlike/CartLikeContentSummary.vue';
-import BASE_ADDRESS_FRAGMENT from '../BaseAddress.gql';
-import DISPLAYABLE_MONEY_FRAGMENT from '../DisplayableMoney.gql';
+import CartLikeSummary from '../common/cartlike/CartLikeSummary.vue';
+import CART_FRAGMENT from '../Cart.gql';
+import ADDRESS_FRAGMENT from '../Address.gql';
+import MONEY_FRAGMENT from '../Money.gql';
 
 export default {
   components: {
-    CartLikeOrderDetail,
-    CartLikeContentSummary,
+    CartLikeSummary,
     LoadingButton,
     ServerError,
     BaseForm,
@@ -50,10 +54,17 @@ export default {
 
   mixins: [cartMixin],
 
+  data() {
+    return {
+      order: null,
+    };
+  },
+
   methods: {
     createOrder() {
-      return this.createMyOrder(this.me.activeCart)
-        .then(() => this.$router.push({ name: 'cart' }));
+      return this.createMyOrder().then((result) => {
+        this.order = result.data.createMyOrderFromCart;
+      });
     },
   },
 
@@ -63,73 +74,13 @@ export default {
         query me($locale: Locale!) {
           me {
             activeCart {
-              id
-              version
-              lineItems {
-                id
-                name(locale: $locale)
-                productSlug(locale: $locale)
-                quantity
-                price {
-                  value {
-                    ...DisplayableMoney
-                  }
-                  discounted {
-                    value {
-                      ...DisplayableMoney
-                    }
-                  }
-                }
-                totalPrice {
-                  ...DisplayableMoney
-                }
-                variant {
-                  sku
-                  images {
-                    url
-                  }
-                }
-              }
-              totalPrice {
-               ...DisplayableMoney
-              }
-              shippingInfo {
-                price {
-                  ...DisplayableMoney
-                }
-              }
-              taxedPrice {
-                totalGross {
-                  ...DisplayableMoney
-                }
-                totalNet {
-                  ...DisplayableMoney
-                }
-              }
-              discountCodes {
-                discountCode {
-                  id
-                  code
-                  name(locale: $locale)
-                }
-              }
-              shippingAddress {
-                ...BaseAddress
-              }
-              billingAddress {
-                ...BaseAddress
-              }
-              shippingInfo {
-                shippingMethod {
-                  name
-                  description
-                }
-              }
+              ...CartFields
             }
           }
         }
-        ${DISPLAYABLE_MONEY_FRAGMENT}
-        ${BASE_ADDRESS_FRAGMENT}`,
+        ${CART_FRAGMENT}
+        ${MONEY_FRAGMENT}
+        ${ADDRESS_FRAGMENT}`,
       variables() {
         return {
           locale: this.$i18n.locale,
@@ -144,19 +95,25 @@ export default {
 };
 </script>
 
+<style scoped>
+.thank-you {
+  background: #FFBA27;
+  padding: 2em;
+  font-size: 16px;
+  margin: 1em 0 2em;
+  font-weight: bold;
+}
+</style>
+
 <i18n>
 en:
   confirmOrder: "Confirm your order"
   completeMyOrder: "Complete My Order"
-  shippingAddress: "Shipping Address"
-  billingAddress: "Billing Address"
-  shippingMethod: "Shipping Method"
-  paymentInformation: "Payment Details"
+  thankYou: "Thank you for your order!"
+  yourOrder: "Your order"
 de:
   completeMyOrder: "Zahlungspflichtig bestellen"
   confirmOrder: "Bestätige Ihre Bestellung"
-  billingAddress: "Zahlungsadresse"
-  shippingAddress: "Versandadresse"
-  shippingMethod: "Versandart"
-  paymentInformation: "Zahlungsdetails"
+  thankYou: "Vielen Dank für Ihre Bestellung!"
+  yourOrder: "Ihre Bestellung"
 </i18n>
diff --git a/src/components/checkout/StepShippingAddressForm.vue b/src/components/checkout/StepShippingAddressForm.vue
index 47d88e68..869957b1 100644
--- a/src/components/checkout/StepShippingAddressForm.vue
+++ b/src/components/checkout/StepShippingAddressForm.vue
@@ -13,7 +13,7 @@
 import gql from 'graphql-tag';
 import cartMixin from '../../mixins/cartMixin';
 import BaseAddressForm from './BaseAddressForm.vue';
-import BASE_ADDRESS_FRAGMENT from '../BaseAddress.gql';
+import ADDRESS_FRAGMENT from '../Address.gql';
 
 export default {
   components: {
@@ -53,12 +53,12 @@ export default {
               id
               version
               shippingAddress {
-                ...BaseAddress
+                ...AddressFields
               }
             }
           }
         }
-        ${BASE_ADDRESS_FRAGMENT}`,
+        ${ADDRESS_FRAGMENT}`,
     },
   },
 };
diff --git a/src/components/checkout/StepShippingMethodForm.vue b/src/components/checkout/StepShippingMethodForm.vue
index b0b07405..79018ad2 100644
--- a/src/components/checkout/StepShippingMethodForm.vue
+++ b/src/components/checkout/StepShippingMethodForm.vue
@@ -36,7 +36,6 @@
 <script>
 import gql from 'graphql-tag';
 import { required } from 'vuelidate/lib/validators';
-import DISPLAYABLE_MONEY_FRAGMENT from '../DisplayableMoney.gql';
 import cartMixin from '../../mixins/cartMixin';
 import BaseRadio from '../common/form/BaseRadio.vue';
 import BaseMoney from '../common/BaseMoney.vue';
@@ -44,6 +43,7 @@ import BaseForm from '../common/form/BaseForm.vue';
 import BaseLabel from '../common/form/BaseLabel.vue';
 import ServerError from '../common/form/ServerError.vue';
 import CheckoutNavigation from './CheckoutNavigation.vue';
+import MONEY_FRAGMENT from '../Money.gql';
 
 export default {
   components: {
@@ -65,9 +65,19 @@ export default {
 
   methods: {
     price(shippingMethod) {
+      const shippingRate = this.matchingShippingRate(shippingMethod);
+      return this.isFree(shippingRate) ? null : shippingRate.price;
+    },
+
+    matchingShippingRate(shippingMethod) {
       return shippingMethod.zoneRates
         .map(zoneRate => zoneRate.shippingRates
-          .find(shippingRate => shippingRate.isMatching))[0]?.price;
+          .find(shippingRate => shippingRate.isMatching))[0];
+    },
+
+    isFree(shippingRate) {
+      const totalPrice = this.me.activeCart.totalPrice.centAmount;
+      return totalPrice > shippingRate.freeAbove?.centAmount;
     },
 
     setShippingMethod() {
@@ -90,7 +100,7 @@ export default {
 
   watch: {
     me(value) {
-      this.form.shippingMethod = value?.activeCart?.shippingInfo?.shippingMethodRef?.id;
+      this.form.shippingMethod = value?.activeCart?.shippingInfo?.shippingMethod?.id;
     },
 
     shippingMethodsByLocation(value) {
@@ -109,7 +119,7 @@ export default {
               id
               version
               shippingInfo {
-                shippingMethodRef {
+                shippingMethod {
                   id
                 }
               }
@@ -118,6 +128,7 @@ export default {
                 state
               }
               totalPrice {
+                centAmount
                 currencyCode
               }
             }
@@ -135,14 +146,17 @@ export default {
             zoneRates {
               shippingRates {
                 isMatching
+                freeAbove {
+                  centAmount
+                }
                 price {
-                  ...DisplayableMoney
+                  ...MoneyFields
                 }
               }
             }
           }
         }
-        ${DISPLAYABLE_MONEY_FRAGMENT}`,
+        ${MONEY_FRAGMENT}`,
       variables() {
         return {
           currency: this.me.activeCart.totalPrice.currencyCode,
diff --git a/src/components/common/BaseMoney.vue b/src/components/common/BaseMoney.vue
index a69896a1..57ef0a21 100644
--- a/src/components/common/BaseMoney.vue
+++ b/src/components/common/BaseMoney.vue
@@ -7,10 +7,7 @@
 <script>
 export default {
   props: {
-    money: {
-      type: Object,
-      required: true,
-    },
+    money: Object,
   },
 
   computed: {
@@ -19,7 +16,10 @@ export default {
     },
 
     amount() {
-      return this.money.centAmount / (10 ** this.money.fractionDigits);
+      if (this.money) {
+        return this.money.centAmount / (10 ** this.money.fractionDigits);
+      }
+      return 0;
     },
   },
 };
diff --git a/src/components/common/cartlike/CartLikeContentSummary.vue b/src/components/common/cartlike/CartLikeContentDetail.vue
similarity index 90%
rename from src/components/common/cartlike/CartLikeContentSummary.vue
rename to src/components/common/cartlike/CartLikeContentDetail.vue
index 10b9e704..172d189d 100644
--- a/src/components/common/cartlike/CartLikeContentSummary.vue
+++ b/src/components/common/cartlike/CartLikeContentDetail.vue
@@ -58,20 +58,11 @@
         </div>
       </div>
     </div>
-    <slot/>
-    <div class="row">
-      <div class="col-sm-12">
-        <CartLikePriceDetail :cartLike="cartLike"
-                             :editable="editable"
-                             class="total-price-calc"/>
-      </div>
-    </div>
   </div>
 </template>
 
 <script>
 import LineItemInfo from './LineItemInfo.vue';
-import CartLikePriceDetail from './CartLikePriceDetail.vue';
 import BasePrice from '../BasePrice.vue';
 import BaseMoney from '../BaseMoney.vue';
 import LineItemQuantityForm from '../../cartdetail/LineItemQuantityForm.vue';
@@ -83,7 +74,6 @@ export default {
     LineItemQuantityForm,
     BaseMoney,
     BasePrice,
-    CartLikePriceDetail,
     LineItemInfo,
   },
 
diff --git a/src/components/common/cartlike/CartLikePriceDetail.vue b/src/components/common/cartlike/CartLikePriceDetail.vue
index 8ed779b7..2f63eb7e 100644
--- a/src/components/common/cartlike/CartLikePriceDetail.vue
+++ b/src/components/common/cartlike/CartLikePriceDetail.vue
@@ -7,7 +7,7 @@
                      :editable="editable"
                      class="col-sm-12"/>
     </div>
-    <hr>
+    <hr v-if="discountCodesExist">
     <div class="row">
       <div class="col-sm-7 subtotal">
         <span class="subtotal-title">{{ $t('subtotal') }}</span>
diff --git a/src/components/common/cartlike/CartLikeOrderDetail.vue b/src/components/common/cartlike/CartLikeSummary.vue
similarity index 90%
rename from src/components/common/cartlike/CartLikeOrderDetail.vue
rename to src/components/common/cartlike/CartLikeSummary.vue
index 44c3d8e0..9ad685e3 100644
--- a/src/components/common/cartlike/CartLikeOrderDetail.vue
+++ b/src/components/common/cartlike/CartLikeSummary.vue
@@ -65,16 +65,26 @@
               {{ payment.paymentMethodInfo.method }}
             </span>
           </div>
+          <span v-else>-</span>
         </div>
       </div>
     </div>
+    <CartLikeContentDetail :cartLike="cartLike"/>
+    <CartLikePriceDetail :cartLike="cartLike"
+                         class="total-price-calc"/>
   </div>
 </template>
 <script>
 import BaseAddress from '../BaseAddress.vue';
+import CartLikePriceDetail from './CartLikePriceDetail.vue';
+import CartLikeContentDetail from './CartLikeContentDetail.vue';
 
 export default {
-  components: { BaseAddress },
+  components: {
+    CartLikeContentDetail,
+    CartLikePriceDetail,
+    BaseAddress,
+  },
 
   props: {
     cartLike: {
diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue
index da9cae21..c5b8868b 100644
--- a/src/components/header/MiniCart.vue
+++ b/src/components/header/MiniCart.vue
@@ -61,13 +61,13 @@
 import Vue from 'vue';
 import gql from 'graphql-tag';
 import VuePerfectScrollbar from 'vue-perfect-scrollbar';
-import cartMixin from '@/mixins/cartMixin';
-import priceMixin from '@/mixins/priceMixin';
-import productMixin from '@/mixins/productMixin';
-import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
+import cartMixin from '../../mixins/cartMixin';
+import priceMixin from '../../mixins/priceMixin';
+import productMixin from '../../mixins/productMixin';
 import BaseMoney from '../common/BaseMoney.vue';
 import LineItemInfo from '../common/cartlike/LineItemInfo.vue';
 import LineItemDeleteForm from '../cartdetail/LineItemDeleteForm.vue';
+import MONEY_FRAGMENT from '../Money.gql';
 
 export default {
   components: {
@@ -130,16 +130,16 @@ export default {
                   }
                 }
                 totalPrice {
-                  ...DisplayableMoney
+                  ...MoneyFields
                 }
               }
               totalPrice {
-                ...DisplayableMoney
+                ...MoneyFields
               }
             }
           }
         }
-        ${DisplayableMoneyFragment}`,
+        ${MONEY_FRAGMENT}`,
       variables() {
         return {
           locale: this.$i18n.locale,
diff --git a/src/components/useraccount/myorders/TabOrderDetail.vue b/src/components/useraccount/myorders/TabOrderDetail.vue
index 2dd460ee..8f9da396 100644
--- a/src/components/useraccount/myorders/TabOrderDetail.vue
+++ b/src/components/useraccount/myorders/TabOrderDetail.vue
@@ -27,8 +27,7 @@
             {{ $t('print') }}
           </button>
         </div>
-        <CartLikeOrderDetail :cart-like="me.order" />
-        <CartLikeContentSummary :cart-like="me.order"/>
+        <CartLikeSummary :cart-like="me.order" />
       </div>
       <div v-else>
         <h1 class="text-center">{{ $t('notFound') }}</h1>
@@ -40,15 +39,14 @@
 <script>
 import gql from 'graphql-tag';
 import BaseDate from '../../common/BaseDate.vue';
-import CartLikeOrderDetail from '../../common/cartlike/CartLikeOrderDetail.vue';
-import CartLikeContentSummary from '../../common/cartlike/CartLikeContentSummary.vue';
-import DISPLAYABLE_MONEY_FRAGMENT from '../../DisplayableMoney.gql';
-import BASE_ADDRESS_FRAGMENT from '../../BaseAddress.gql';
+import CartLikeSummary from '../../common/cartlike/CartLikeSummary.vue';
+import ORDER_FRAGMENT from '../../Order.gql';
+import ADDRESS_FRAGMENT from '../../Address.gql';
+import MONEY_FRAGMENT from '../../Money.gql';
 
 export default {
   components: {
-    CartLikeOrderDetail,
-    CartLikeContentSummary,
+    CartLikeSummary,
     BaseDate,
   },
 
@@ -62,86 +60,13 @@ export default {
         query orderByOrderNumber($orderNumber: String, $locale: Locale!) {
           me {
             order(orderNumber: $orderNumber) {
-              id
-              version
-              orderNumber
-              createdAt
-              shippingAddress {
-                ...BaseAddress
-              }
-              billingAddress {
-                ...BaseAddress
-              }
-              shippingInfo {
-                price {
-                  ...DisplayableMoney
-                }
-                shippingMethod {
-                  name
-                  description
-                }
-              }
-              paymentInfo {
-                payments {
-                  paymentMethodInfo {
-                    method
-                  }
-                }
-              }
-              taxedPrice {
-                totalGross {
-                  ...DisplayableMoney
-                }
-                totalNet {
-                  ...DisplayableMoney
-                }
-                taxPortions {
-                  amount {
-                    ...DisplayableMoney
-                  }
-                }
-              }
-              totalPrice {
-                ...DisplayableMoney
-              }
-              discountCodes {
-                discountCode {
-                  id
-                  code
-                  name(locale: $locale)
-                }
-              }
-              lineItems {
-                id
-                quantity
-                name(locale: $locale)
-                productSlug(locale: $locale)
-                price{
-                    value {
-                      ...DisplayableMoney
-                    }
-                    discounted {
-                      value {
-                        ...DisplayableMoney
-                      }
-                    }
-                  }
-                totalPrice {
-                  ...DisplayableMoney
-                }
-                variant {
-                  images {
-                    url
-                    label
-                  }
-                  sku
-                }
-              }
+              ...OrderFields
             }
           }
         }
-        ${DISPLAYABLE_MONEY_FRAGMENT}
-        ${BASE_ADDRESS_FRAGMENT}`,
+        ${ORDER_FRAGMENT}
+        ${MONEY_FRAGMENT}
+        ${ADDRESS_FRAGMENT}`,
       variables() {
         return {
           orderNumber: this.$route.params.orderNumber,
diff --git a/src/components/useraccount/myorders/TabOrderList.vue b/src/components/useraccount/myorders/TabOrderList.vue
index 513abcb6..9359c3f9 100644
--- a/src/components/useraccount/myorders/TabOrderList.vue
+++ b/src/components/useraccount/myorders/TabOrderList.vue
@@ -81,7 +81,7 @@
 import gql from 'graphql-tag';
 import BaseMoney from '../../common/BaseMoney.vue';
 import BaseDate from '../../common/BaseDate.vue';
-import DisplayableMoneyFragment from '@/components/DisplayableMoney.gql';
+import MONEY_FRAGMENT from '../../Money.gql';
 
 export default {
   components: { BaseMoney, BaseDate },
@@ -106,7 +106,7 @@ export default {
                 id
                 orderNumber
                 totalPrice {
-                  ...DisplayableMoney
+                  ...MoneyFields
                 }
                 createdAt
                 shipmentState
@@ -115,7 +115,7 @@ export default {
             }
           }
         },
-        ${DisplayableMoneyFragment}`,
+        ${MONEY_FRAGMENT}`,
     },
   },
 };
diff --git a/src/i18n/de.yaml b/src/i18n/de.yaml
index 22a01b2b..7016179c 100644
--- a/src/i18n/de.yaml
+++ b/src/i18n/de.yaml
@@ -222,11 +222,6 @@ checkout:
     securityCodeTooltip: "Normalerweise befindet sich der Code auf der Rückseite."
   confirmationPage:
     title: "Sicherer Bestellprozess - Versand"
-  thankYouPage:
-    title: "Vielen Dank für Ihre Bestellung!"
-    emailSentToStart: "Eine Email wurde versandt"
-    emailSentToEnd: "als Bestellbestätigung."
-    yourOrderDetails: "Ihre Bestelldetails"
 myAccount:
   addressBook:
     title: "Addressbuch"
diff --git a/src/i18n/en.yaml b/src/i18n/en.yaml
index a9169de2..e33a59fa 100644
--- a/src/i18n/en.yaml
+++ b/src/i18n/en.yaml
@@ -220,11 +220,6 @@ checkout:
     securityCodeTooltip: "normally you find it on the back of your card"
   confirmationPage:
     title: "Secure Checkout - Confirmation"
-  thankYouPage:
-    title: "Thank you for your order!"
-    emailSentToStart: "An email has been sent to"
-    emailSentToEnd: "as a copy of this confirmation purchase"
-    yourOrderDetails: "Your order details"
 myAccount:
   addressBook:
     title: "Address Book"
diff --git a/src/components/BasicCart.gql b/src/mixins/BasicCart.gql
similarity index 100%
rename from src/components/BasicCart.gql
rename to src/mixins/BasicCart.gql
diff --git a/src/components/BasicCustomer.gql b/src/mixins/BasicCustomer.gql
similarity index 100%
rename from src/components/BasicCustomer.gql
rename to src/mixins/BasicCustomer.gql
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index 77e189b3..200096c7 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -1,7 +1,9 @@
 import gql from 'graphql-tag';
-import BASIC_CART_QUERY from '../components/BasicCart.gql';
-import DISPLAYABLE_MONEY_FRAGMENT from '../components/DisplayableMoney.gql';
-import BASIC_ADDRESS_FRAGMENT from '../components/BaseAddress.gql';
+import BASIC_CART_QUERY from './BasicCart.gql';
+import CART_FRAGMENT from '../components/Cart.gql';
+import ORDER_FRAGMENT from '../components/Order.gql';
+import MONEY_FRAGMENT from '../components/Money.gql';
+import ADDRESS_FRAGMENT from '../components/Address.gql';
 
 function cartExists(vm) {
   return vm.me?.activeCart;
@@ -38,77 +40,14 @@ export default {
       // required any queried field to be fetched in order to update all components using carts, e.g. mini-cart
       return this.$apollo.mutate({
         mutation: gql`
-          mutation updateMyCart(
-          $actions: [MyCartUpdateAction!]!,
-          $id: String!,
-          $version: Long!,
-          $locale: Locale!) {
+          mutation updateMyCart($id: String!, $version: Long!, $actions: [MyCartUpdateAction!]!, $locale: Locale!) {
             updateMyCart(id: $id, version: $version, actions: $actions) {
-              id
-              version
-              totalPrice {
-                ...DisplayableMoney
-              }
-              shippingInfo {
-                price {
-                  ...DisplayableMoney
-                }
-              }
-              taxedPrice {
-                totalGross {
-                  ...DisplayableMoney
-                }
-                totalNet {
-                  ...DisplayableMoney
-                }
-              }
-              lineItems {
-                id
-                quantity
-                name(locale: $locale)
-                productSlug(locale: $locale)
-                variant {
-                  sku
-                  images {
-                    url
-                  }
-                }
-                price {
-                  value {
-                    ...DisplayableMoney
-                  }
-                  discounted {
-                    value {
-                      ...DisplayableMoney
-                    }
-                  }
-                }
-                totalPrice {
-                  ...DisplayableMoney
-                }
-              }
-              discountCodes {
-                discountCode {
-                  id
-                  code
-                  name(locale: $locale)
-                }
-              }
-              shippingAddress {
-                ...BaseAddress
-              }
-              billingAddress {
-                ...BaseAddress
-              }
-              shippingInfo {
-                shippingMethodRef {
-                  id
-                }
-              }
+              ...CartFields
             }
           }
-          ${DISPLAYABLE_MONEY_FRAGMENT}
-          ${BASIC_ADDRESS_FRAGMENT}`,
+          ${CART_FRAGMENT}
+          ${MONEY_FRAGMENT}
+          ${ADDRESS_FRAGMENT}`,
         variables: {
           actions,
           id: this.me.activeCart?.id,
@@ -136,18 +75,22 @@ export default {
       });
     },
 
-    createMyOrder({ id, version }) {
+    createMyOrder() {
       return this.$apollo.mutate({
         mutation: gql`
-          mutation ($id: String!, $version: Long!) {
-            createMyOrderFromCart(draft: {
-              id: $id,
-              version: $version
-            }) {
-              id
+          mutation ($id: String!, $version: Long!, $locale: Locale!) {
+            createMyOrderFromCart(draft: { id: $id, version: $version }) {
+              ...OrderFields
             }
-          }`,
-        variables: { id, version },
+          }
+          ${ORDER_FRAGMENT}
+          ${MONEY_FRAGMENT}
+          ${ADDRESS_FRAGMENT}`,
+        variables: {
+          id: this.me.activeCart?.id,
+          version: this.me.activeCart?.version,
+          locale: this.$i18n.locale,
+        },
         update: (store) => {
           const data = store.readQuery({ query: BASIC_CART_QUERY });
           data.me.activeCart = null;
diff --git a/src/mixins/customerMixin.js b/src/mixins/customerMixin.js
index 114f15a1..08ac4461 100644
--- a/src/mixins/customerMixin.js
+++ b/src/mixins/customerMixin.js
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import BASIC_CUSTOMER_QUERY from '../components/BasicCustomer.gql';
+import BASIC_CUSTOMER_QUERY from './BasicCustomer.gql';
 
 export default {
   methods: {

From 56b35f36e44c5370c58096b508f00d3e15d1dff3 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 26 Jul 2019 18:30:54 +0200
Subject: [PATCH 43/69] Change step in checkout title

---
 src/components/checkout/CheckoutTitle.vue | 21 ++++++++++++------
 src/components/checkout/PageCheckout.vue  | 27 +++--------------------
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/components/checkout/CheckoutTitle.vue b/src/components/checkout/CheckoutTitle.vue
index 849ad50b..a7935b0f 100644
--- a/src/components/checkout/CheckoutTitle.vue
+++ b/src/components/checkout/CheckoutTitle.vue
@@ -14,15 +14,15 @@
     </div>
     <div class="col-md-6">
       <div class="checkout-steps text-right">
-        <div :class="activeClass(1)">
+        <div :class="isActive(step, 1)">
           <span class="step-number">1</span>
           <span class="text-uppercase step-title">{{ $t("shipping") }}</span>
         </div>
-        <div :class="activeClass(2)">
+        <div :class="isActive(step, 2)">
           <span class="step-number">2</span>
           <span class="text-uppercase step-title">{{ $t("payment") }}</span>
         </div>
-        <div :class="activeClass(3)">
+        <div :class="isActive(step, 3)">
           <span class="step-number">3</span>
           <span class="text-uppercase step-title">{{ $t("confirmation") }}</span>
         </div>
@@ -33,12 +33,19 @@
 
 <script>
 export default {
-  props: { step: Number },
+  computed: {
+    step() {
+      switch (this.$route.name) {
+        case 'checkout-payment-method': return 2;
+        case 'checkout-order': return 3;
+        default: return 1;
+      }
+    },
+  },
 
   methods: {
-    activeClass(step) {
-      console.log(this.$router.currentRoute);
-      return { active: this.step === step };
+    isActive(current, step) {
+      return { active: current === step };
     },
   },
 };
diff --git a/src/components/checkout/PageCheckout.vue b/src/components/checkout/PageCheckout.vue
index 83bc92e9..60c8d4e5 100644
--- a/src/components/checkout/PageCheckout.vue
+++ b/src/components/checkout/PageCheckout.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="checkout">
     <div class="container">
-      <CheckoutTitle :step="1"/>
+      <CheckoutTitle/>
       <div class="row">
         <div class="col-sm-12">
           <div class="checkout-content">
@@ -25,6 +25,8 @@ export default {
 
 <style lang="scss">
 #checkout {
+  margin-bottom: 70px;
+
   .checkout-content {
     padding: 1em 2em 2em;
   }
@@ -76,26 +78,3 @@ export default {
   }
 }
 </style>
-
-<i18n>
-en:
-  orderDate: "Order Date"
-  orderDiscount: "Order Discount"
-  orderNumber: "Order Number"
-  shippingInformation: "Shipping Information"
-  thankYouPage:
-  title: "Thank you for your order!"
-  emailSentToStart: "An email has been sent to"
-  emailSentToEnd: "as a copy of this confirmation purchase"
-  yourOrderDetails: "Your order details"
-de:
-  orderDate: "Bestelldatum"
-  orderDiscount: "Bestelldiscount"
-  orderNumber: "Bestellnummer"
-  shippingInformation: "Versand Information"
-  thankYouPage:
-  title: "Vielen Dank für Ihre Bestellung!"
-  emailSentToStart: "Eine Email wurde versandt"
-  emailSentToEnd: "als Bestellbestätigung."
-  yourOrderDetails: "Ihre Bestelldetails"
-</i18n>

From 0ff271141ead9bda75bd4472928a63560e007f6d Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 26 Jul 2019 18:31:10 +0200
Subject: [PATCH 44/69] Give checkout pages a unique header/footer

---
 src/router.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/router.js b/src/router.js
index 3da08d5d..0c2e09da 100644
--- a/src/router.js
+++ b/src/router.js
@@ -3,6 +3,8 @@ import Router from 'vue-router';
 import store from './store';
 import TheHeader from './components/header/TheHeader.vue';
 import TheFooter from './components/footer/TheFooter.vue';
+import TheCheckoutHeader from './components/header/TheCheckoutHeader.vue';
+import TheCheckoutFooter from './components/footer/TheCheckoutFooter.vue';
 import PageHome from './components/home/PageHome.vue';
 import PageProductOverview from './components/productoverview/PageProductOverview.vue';
 import PageLogin from './components/login/PageLogin.vue';
@@ -120,7 +122,8 @@ const router = new Router({
       path: '/checkout',
       components: {
         default: PageCheckout,
-        header: TheHeader,
+        header: TheCheckoutHeader,
+        footer: TheCheckoutFooter,
       },
       children: [
         {

From 829c2b2e334d2df9d06a3eec8cc8cbf5c02172c7 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 26 Jul 2019 18:31:40 +0200
Subject: [PATCH 45/69] Improve style of thank you message

---
 src/components/checkout/StepPlaceOrderForm.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/checkout/StepPlaceOrderForm.vue b/src/components/checkout/StepPlaceOrderForm.vue
index 94d62641..d9d2ec1b 100644
--- a/src/components/checkout/StepPlaceOrderForm.vue
+++ b/src/components/checkout/StepPlaceOrderForm.vue
@@ -2,7 +2,9 @@
   <div>
     <div v-if="order">
       <div class="row thank-you">
-        <div class="col-sm-12">{{ $t('thankYou') }}</div>
+        <div class="col-sm-12">
+          {{ $t('thankYou') }}
+        </div>
       </div>
       <div class="checkout-step-title">
         <span>{{ $t('yourOrder') }}</span>
@@ -95,13 +97,14 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .thank-you {
+  text-transform: uppercase;
+  font-weight: bold;
   background: #FFBA27;
   padding: 2em;
   font-size: 16px;
   margin: 1em 0 2em;
-  font-weight: bold;
 }
 </style>
 
@@ -110,10 +113,12 @@ en:
   confirmOrder: "Confirm your order"
   completeMyOrder: "Complete My Order"
   thankYou: "Thank you for your order!"
-  yourOrder: "Your order"
+  yourOrder: "Your order details"
+  continueShopping: "Continue shopping"
 de:
   completeMyOrder: "Zahlungspflichtig bestellen"
   confirmOrder: "Bestätige Ihre Bestellung"
   thankYou: "Vielen Dank für Ihre Bestellung!"
-  yourOrder: "Ihre Bestellung"
+  yourOrder: "Ihre Bestelldetails"
+  continueShopping: "Weiter einkaufen"
 </i18n>

From 51c41656d5de809642defb28b2173d3aecc75aa6 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 26 Jul 2019 18:36:24 +0200
Subject: [PATCH 46/69] Scroll to the top on changing pages

---
 src/components/checkout/StepPlaceOrderForm.vue | 1 +
 src/router.js                                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/checkout/StepPlaceOrderForm.vue b/src/components/checkout/StepPlaceOrderForm.vue
index d9d2ec1b..e9585810 100644
--- a/src/components/checkout/StepPlaceOrderForm.vue
+++ b/src/components/checkout/StepPlaceOrderForm.vue
@@ -66,6 +66,7 @@ export default {
     createOrder() {
       return this.createMyOrder().then((result) => {
         this.order = result.data.createMyOrderFromCart;
+        window.scrollTo(0, 0);
       });
     },
   },
diff --git a/src/router.js b/src/router.js
index 0c2e09da..b8d2e1f0 100644
--- a/src/router.js
+++ b/src/router.js
@@ -30,6 +30,7 @@ const requiresAuth = true;
 const router = new Router({
   mode: 'history',
   base: process.env.BASE_URL,
+  scrollBehavior: () => ({ x: 0, y: 0 }),
   routes: [
     {
       path: '*',

From 8369fcf3033891ee3093c4d39569dcf39c8efefa Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 26 Jul 2019 18:41:21 +0200
Subject: [PATCH 47/69] Close minicart on clicking to cart/checkout

---
 src/components/header/MiniCart.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue
index c5b8868b..5be89be3 100644
--- a/src/components/header/MiniCart.vue
+++ b/src/components/header/MiniCart.vue
@@ -47,10 +47,12 @@
           <BaseMoney :money="me.activeCart.totalPrice"/>
         </p>
         <router-link :to="{ name: 'cart' }"
+                     @click.native="toggle"
                      class="btn-grey">
           {{ $t('viewBag') }}
         </router-link>
         <router-link :to="{ name: 'checkout' }"
+                     @click.native="toggle"
                      class="btn-yellow">{{ $t('checkout') }}</router-link>
       </div>
     </transition>

From aff49ea844e79a5610a82355ac382aaf5768e100 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Wed, 31 Jul 2019 14:10:40 +0200
Subject: [PATCH 48/69] Redirect to home if cart is empty

---
 .../checkout/StepPlaceOrderForm.vue           | 12 +++++++++++
 src/components/header/LoginButton.vue         |  1 -
 .../userdetail/EditProfileForm.vue            |  1 -
 .../userdetail/TabPersonalDetails.vue         |  1 -
 src/router.js                                 | 20 ++++++++++++++++---
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/components/checkout/StepPlaceOrderForm.vue b/src/components/checkout/StepPlaceOrderForm.vue
index e9585810..bfaf072b 100644
--- a/src/components/checkout/StepPlaceOrderForm.vue
+++ b/src/components/checkout/StepPlaceOrderForm.vue
@@ -71,6 +71,18 @@ export default {
     },
   },
 
+  watch: {
+    me(value) {
+      if (value.activeCart) {
+        if (!value.activeCart.shippingAddress) {
+          this.$router.push({ name: 'checkout' });
+        } else if (!value.activeCart.shippingInfo) {
+          this.$router.push({ name: 'checkout-shipping-method' });
+        }
+      }
+    },
+  },
+
   apollo: {
     me: {
       query: gql`
diff --git a/src/components/header/LoginButton.vue b/src/components/header/LoginButton.vue
index e385af64..b4b998d9 100644
--- a/src/components/header/LoginButton.vue
+++ b/src/components/header/LoginButton.vue
@@ -57,7 +57,6 @@ export default {
             }
           }
         }`,
-      skip: vm => !vm.$store.state.authenticated,
     },
   },
 };
diff --git a/src/components/useraccount/userdetail/EditProfileForm.vue b/src/components/useraccount/userdetail/EditProfileForm.vue
index 786648cf..09699d50 100644
--- a/src/components/useraccount/userdetail/EditProfileForm.vue
+++ b/src/components/useraccount/userdetail/EditProfileForm.vue
@@ -163,7 +163,6 @@ export default {
             }
           }
         }`,
-      skip: vm => !vm.$store.state.authenticated,
     },
   },
 
diff --git a/src/components/useraccount/userdetail/TabPersonalDetails.vue b/src/components/useraccount/userdetail/TabPersonalDetails.vue
index 369d718a..67784d69 100644
--- a/src/components/useraccount/userdetail/TabPersonalDetails.vue
+++ b/src/components/useraccount/userdetail/TabPersonalDetails.vue
@@ -66,7 +66,6 @@ export default {
             }
           }
         }`,
-      skip: vm => !vm.$store.state.authenticated,
     },
   },
 };
diff --git a/src/router.js b/src/router.js
index b8d2e1f0..d4b908de 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,6 +1,8 @@
 import Vue from 'vue';
 import Router from 'vue-router';
+import gql from 'graphql-tag';
 import store from './store';
+import apollo from './apollo';
 import TheHeader from './components/header/TheHeader.vue';
 import TheFooter from './components/footer/TheFooter.vue';
 import TheCheckoutHeader from './components/header/TheCheckoutHeader.vue';
@@ -26,6 +28,7 @@ import StepPlaceOrderForm from './components/checkout/StepPlaceOrderForm.vue';
 Vue.use(Router);
 
 const requiresAuth = true;
+const requiresCart = true;
 
 const router = new Router({
   mode: 'history',
@@ -121,6 +124,7 @@ const router = new Router({
     },
     {
       path: '/checkout',
+      meta: { requiresCart },
       components: {
         default: PageCheckout,
         header: TheCheckoutHeader,
@@ -153,14 +157,24 @@ const router = new Router({
   ],
 });
 
-const authGuard = async (to, from, next) => {
+router.beforeEach(async (to, from, next) => {
   const routeRequiresAuth = to.matched.some(record => record.meta.requiresAuth);
   if (routeRequiresAuth && !store.state.authenticated) {
     next({ name: 'login' });
   } else {
     next();
   }
-};
-router.beforeEach(authGuard);
+});
+
+router.beforeEach(async (to, from, next) => {
+  const routeRequiresCart = to.matched.some(record => record.meta.requiresCart);
+  if (routeRequiresCart) {
+    const hasCart = await apollo.defaultClient
+      .query({ query: gql`{ me { activeCart { id } } }` })
+      .then(result => !!result.data.me.activeCart);
+    if (!hasCart) next('/');
+  }
+  next();
+});
 
 export default router;

From 111457300c8dab876078f5f8f6d2446f6abb8e50 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 5 Aug 2019 18:12:07 +0200
Subject: [PATCH 49/69] Keep in store locale, country and currency

---
 package-lock.json                             | 14 ++++
 package.json                                  |  1 +
 src/auth.js                                   | 47 ++++-------
 src/components/cartdetail/PageCartDetail.vue  |  2 +-
 src/components/checkout/BaseAddressForm.vue   | 18 ++---
 src/components/checkout/CartOverview.vue      |  2 +-
 .../checkout/StepPlaceOrderForm.vue           |  2 +-
 src/components/common/Breadcrumb.vue          |  4 +-
 src/components/common/ProductThumbnail.vue    | 13 ++-
 src/components/header/CategoriesMenu.vue      |  2 +-
 src/components/header/LocationSelector.vue    | 79 +++++++++++++------
 src/components/header/LoginButton.vue         |  1 +
 src/components/header/MiniCart.vue            |  5 +-
 src/components/home/BannerPicture.vue         |  2 +-
 .../productdetail/AddToCartForm.vue           |  7 +-
 .../productdetail/DetailsSection.vue          |  2 +-
 src/components/productdetail/ProductInfo.vue  | 23 +++---
 .../productoverview/ProductList.vue           | 10 +--
 .../useraccount/myorders/TabOrderDetail.vue   |  2 +-
 src/i18n/de.yaml                              |  3 -
 src/i18n/en.yaml                              |  3 -
 src/i18n/i18n.js                              | 54 ++-----------
 src/mixins/cartMixin.js                       |  6 +-
 src/mixins/priceMixin.js                      | 20 -----
 src/store.js                                  | 59 +++++++++++++-
 sunrise.config.js                             | 37 +++++++++
 yarn.lock                                     | 15 +++-
 27 files changed, 249 insertions(+), 184 deletions(-)
 delete mode 100644 src/mixins/priceMixin.js

diff --git a/package-lock.json b/package-lock.json
index b5958c0f..8cf02b97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15448,6 +15448,11 @@
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "dev": true
     },
+    "shvl": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/shvl/-/shvl-1.3.1.tgz",
+      "integrity": "sha512-+rRPP46hloYUAEImJcqprUgXu+05Ikqr4h4V+w5i2zJy37nAqtkQKufs3+3S2fDq6JNRrHMIQhB/Vaex+jgAAw=="
+    },
     "sigmund": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
@@ -17533,6 +17538,15 @@
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.1.tgz",
       "integrity": "sha512-ER5moSbLZuNSMBFnEBVGhQ1uCBNJslH9W/Dw2W7GZN23UQA69uapP5GTT9Vm8Trc0PzBSVt6LzF3hGjmv41xcg=="
     },
+    "vuex-persistedstate": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-2.5.4.tgz",
+      "integrity": "sha512-XYJhKIwO+ZVlTaXyxKxnplrJ88Fnvk5aDw753bxzRw5/yMKLQ6lq9CDCBex2fwZaQcLibhtgJOxGCHjy9GLSlQ==",
+      "requires": {
+        "deepmerge": "^2.1.0",
+        "shvl": "^1.3.0"
+      }
+    },
     "w3c-hr-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
diff --git a/package.json b/package.json
index 5214a521..dab6c2d5 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "vue-router": "^3.0.3",
     "vuelidate": "^0.7.4",
     "vuex": "^3.0.1",
+    "vuex-persistedstate": "^2.5.4",
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
diff --git a/src/auth.js b/src/auth.js
index 78f2c0fc..435b3129 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -2,48 +2,29 @@ import SdkAuth, { TokenProvider } from '@commercetools/sdk-auth';
 import store from './store';
 import config from '../sunrise.config';
 
-const tokenInfoStorageName = 'token';
-const isAuthenticatedStorageName = 'auth';
-let storedTokenInfo;
-
-try {
-  storedTokenInfo = JSON.parse(localStorage.getItem(tokenInfoStorageName));
-  const isAuthenticated = localStorage.getItem(isAuthenticatedStorageName);
-  if (storedTokenInfo && isAuthenticated) {
-    store.dispatch('setAuthenticated', true);
-  }
-} catch (error) {
-  // eslint-disable-next-line no-console
-  console.error('Could not retrieve token from local storage', error);
-}
-
 const tokenProvider = new TokenProvider({
   sdkAuth: new SdkAuth(config.ct.auth),
   fetchTokenInfo: sdkAuth => sdkAuth.anonymousFlow(),
-  onTokenInfoChanged: tokenInfo => localStorage.setItem(tokenInfoStorageName, JSON.stringify(tokenInfo)),
-}, storedTokenInfo);
+  onTokenInfoChanged: tokenInfo => store.dispatch('setTokenInfo', tokenInfo),
+}, store.state.tokenInfo);
 
 export function cleanUpSession() {
   tokenProvider.invalidateTokenInfo();
-  localStorage.removeItem(tokenInfoStorageName);
-  localStorage.removeItem(isAuthenticatedStorageName);
-  return store.dispatch('setAuthenticated', false);
+  return store.dispatch('clearAuthentication');
 }
 
 export function clientLogin(apolloClient, credentials) {
-  localStorage.removeItem(tokenInfoStorageName);
-  tokenProvider.fetchTokenInfo = sdkAuth => sdkAuth.customerPasswordFlow(credentials);
-  tokenProvider.invalidateTokenInfo();
-  return apolloClient.resetStore()
-    .then(() => {
-      localStorage.setItem(isAuthenticatedStorageName, true);
-      return store.dispatch('setAuthenticated', true);
-    })
-    .catch((error) => {
-      // eslint-disable-next-line no-console
-      console.error('Error on cache reset during login', error);
-      return cleanUpSession();
-    });
+  return store.dispatch('clearAuthentication').then(() => {
+    tokenProvider.fetchTokenInfo = sdkAuth => sdkAuth.customerPasswordFlow(credentials);
+    tokenProvider.invalidateTokenInfo();
+    return apolloClient.resetStore()
+      .then(() => store.dispatch('setAuthenticated', true))
+      .catch((error) => {
+        // eslint-disable-next-line no-console
+        console.error('Error on cache reset during login', error);
+        return cleanUpSession();
+      });
+  });
 }
 
 export function clientLogout(apolloClient, redirect) {
diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index 2ac13dc0..e4c4ccd2 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -89,7 +89,7 @@ export default {
         ${ADDRESS_FRAGMENT}`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/components/checkout/BaseAddressForm.vue b/src/components/checkout/BaseAddressForm.vue
index 7dc7cac1..e3a80ad0 100644
--- a/src/components/checkout/BaseAddressForm.vue
+++ b/src/components/checkout/BaseAddressForm.vue
@@ -93,6 +93,11 @@ import CheckoutNavigation from './CheckoutNavigation.vue';
 import BaseForm from '../common/form/BaseForm.vue';
 
 export default {
+  props: {
+    address: Object,
+    onSubmit: Function,
+  },
+
   components: {
     BaseForm,
     CheckoutNavigation,
@@ -101,22 +106,15 @@ export default {
     BaseSelect,
   },
 
-  props: {
-    address: Object,
-    onSubmit: Function,
-  },
-
   data: () => ({
     form: {},
   }),
 
   computed: {
     countries() {
-      return [
-        { id: null, name: this.$t('selectCountry') },
-        { id: 'DE', name: 'Deutschland' },
-        { id: 'US', name: 'United States' },
-      ];
+      const configCountries = this.$sunrise.countries;
+      const countries = configCountries ? Object.entries(configCountries) : [];
+      return countries.map(([id, name]) => ({ id, name }));
     },
   },
 
diff --git a/src/components/checkout/CartOverview.vue b/src/components/checkout/CartOverview.vue
index f15acb39..ca7768f3 100644
--- a/src/components/checkout/CartOverview.vue
+++ b/src/components/checkout/CartOverview.vue
@@ -96,7 +96,7 @@ export default {
         ${ADDRESS_FRAGMENT}`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/components/checkout/StepPlaceOrderForm.vue b/src/components/checkout/StepPlaceOrderForm.vue
index bfaf072b..cd831b1e 100644
--- a/src/components/checkout/StepPlaceOrderForm.vue
+++ b/src/components/checkout/StepPlaceOrderForm.vue
@@ -98,7 +98,7 @@ export default {
         ${ADDRESS_FRAGMENT}`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/components/common/Breadcrumb.vue b/src/components/common/Breadcrumb.vue
index ec004843..08ffac7c 100644
--- a/src/components/common/Breadcrumb.vue
+++ b/src/components/common/Breadcrumb.vue
@@ -61,8 +61,8 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
-          where: `slug(${this.$i18n.locale}="${this.categorySlug}")`,
+          locale: this.$store.state.locale,
+          where: `slug(${this.$store.state.locale}="${this.categorySlug}")`,
         };
       },
       skip: vm => !vm.categorySlug,
diff --git a/src/components/common/ProductThumbnail.vue b/src/components/common/ProductThumbnail.vue
index 38fd7ffb..3a8f0d2b 100644
--- a/src/components/common/ProductThumbnail.vue
+++ b/src/components/common/ProductThumbnail.vue
@@ -86,15 +86,10 @@
 </template>
 
 <script>
-import priceMixin from '@/mixins/priceMixin';
 import productMixin from '@/mixins/productMixin';
 import BasePrice from './BasePrice.vue';
 
 export default {
-  components: {
-    BasePrice,
-  },
-
   props: {
     product: {
       type: Object,
@@ -102,6 +97,12 @@ export default {
     },
   },
 
+  components: {
+    BasePrice,
+  },
+
+  mixins: [productMixin],
+
   computed: {
     matchingVariant() {
       // with query endpoint we cannot really determine
@@ -121,8 +122,6 @@ export default {
       return Array.isArray(this.matchingVariant.images) && this.matchingVariant.images.length > 0;
     },
   },
-
-  mixins: [priceMixin, productMixin],
 };
 </script>
 
diff --git a/src/components/header/CategoriesMenu.vue b/src/components/header/CategoriesMenu.vue
index f271d528..f5580a69 100644
--- a/src/components/header/CategoriesMenu.vue
+++ b/src/components/header/CategoriesMenu.vue
@@ -117,7 +117,7 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/components/header/LocationSelector.vue b/src/components/header/LocationSelector.vue
index 71a84fb7..8c3878c6 100644
--- a/src/components/header/LocationSelector.vue
+++ b/src/components/header/LocationSelector.vue
@@ -1,5 +1,5 @@
 <template>
-  <li v-if="languages.length"
+  <li v-if="languages.length || countries.length"
       @mouseleave="setCloseTimer"
       @mouseenter="clearCloseTimer"
       data-test="location-selector"
@@ -8,31 +8,31 @@
             data-test="location-selector-open-button">
       <img class="pull-right"
            src="../../assets/img/globe-2.png"
-           :alt="$t('main.header.location')">
+           :alt="$t('location')">
     </button>
     <transition name="fade">
       <div v-if="show"
            class="location-dropdown">
-        <!--{{#if location.language}}-->
-        <span class="location-dropdown-label">
-        {{ $t("main.header.language") }}
-        </span>
-        <SelectBoxIt v-model="$i18n.locale"
-                     :options="languages"
-                     id="language"
-                     data-test="location-selector-dropdown"
-                     class="select location-select"/>
-        <!--{{/if}}-->
-        <!--{{#if location.country}}-->
-        <!--<form id="form-select-country" action="{{@root.meta._links.selectCountry.href}}" method="POST">-->
-        <!--<input type="hidden" name="csrfToken" value="{{@root.meta.csrfToken}}"/>-->
-        <!--<span class="location-dropdown-label">{{i18n "main:header.country"}}</span>-->
-        <!--<select name="country" id="country-select" class="select location-select">-->
-        <!--{{#each location.country}}-->
-        <!--<option value="{{value}}" {{#if selected}}selected{{/if}}>{{label}}</option>-->
-        <!--{{/each}}-->
-        <!--</select>-->
-        <!--{{/if}}-->
+        <div v-if="languages.length">
+          <span class="location-dropdown-label">
+            {{ $t('language') }}
+          </span>
+          <SelectBoxIt v-model="language"
+                       :options="languages"
+                       id="language"
+                       data-test="location-selector-dropdown"
+                       class="select location-select"/>
+        </div>
+        <div v-if="countries.length">
+          <span class="location-dropdown-label">
+            {{ $t('country') }}
+          </span>
+          <SelectBoxIt v-model="country"
+                       :options="countries"
+                       id="country-select"
+                       data-test="location-selector-dropdown"
+                       class="select location-select"/>
+        </div>
       </div>
     </transition>
   </li>
@@ -52,11 +52,35 @@ export default {
   }),
 
   computed: {
+    country: {
+      get() {
+        return this.$store.state.country;
+      },
+      set(value) {
+        this.$store.dispatch('setCountry', value);
+      },
+    },
+
+    language: {
+      get() {
+        return this.$store.state.locale;
+      },
+      set(value) {
+        this.$store.dispatch('setLocale', value);
+      },
+    },
+
     languages() {
       const configLangs = this.$sunrise.languages;
       const langs = configLangs ? Object.entries(configLangs) : [];
       return langs.map(([id, name]) => ({ id, name }));
     },
+
+    countries() {
+      const configCountries = this.$sunrise.countries;
+      const countries = configCountries ? Object.entries(configCountries) : [];
+      return countries.map(([id, name]) => ({ id, name }));
+    },
   },
 
   methods: {
@@ -72,3 +96,14 @@ export default {
   },
 };
 </script>
+
+<i18n>
+en:
+  location: "Location"
+  language: "Language"
+  country: "Country"
+de:
+  location: "Ort"
+  language: "Sprache"
+  country: "Land"
+</i18n>
diff --git a/src/components/header/LoginButton.vue b/src/components/header/LoginButton.vue
index b4b998d9..e385af64 100644
--- a/src/components/header/LoginButton.vue
+++ b/src/components/header/LoginButton.vue
@@ -57,6 +57,7 @@ export default {
             }
           }
         }`,
+      skip: vm => !vm.$store.state.authenticated,
     },
   },
 };
diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue
index 5be89be3..cd2e4c33 100644
--- a/src/components/header/MiniCart.vue
+++ b/src/components/header/MiniCart.vue
@@ -64,7 +64,6 @@ import Vue from 'vue';
 import gql from 'graphql-tag';
 import VuePerfectScrollbar from 'vue-perfect-scrollbar';
 import cartMixin from '../../mixins/cartMixin';
-import priceMixin from '../../mixins/priceMixin';
 import productMixin from '../../mixins/productMixin';
 import BaseMoney from '../common/BaseMoney.vue';
 import LineItemInfo from '../common/cartlike/LineItemInfo.vue';
@@ -79,7 +78,7 @@ export default {
     VuePerfectScrollbar,
   },
 
-  mixins: [cartMixin, priceMixin, productMixin],
+  mixins: [cartMixin, productMixin],
 
   data: () => ({
     me: null,
@@ -144,7 +143,7 @@ export default {
         ${MONEY_FRAGMENT}`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/components/home/BannerPicture.vue b/src/components/home/BannerPicture.vue
index 1b9fe0a4..54d2a0c2 100644
--- a/src/components/home/BannerPicture.vue
+++ b/src/components/home/BannerPicture.vue
@@ -14,7 +14,7 @@ export default {
     src() {
       try {
         // eslint-disable-next-line import/no-dynamic-require, global-require
-        return require(`@/assets/img/banners/${this.$i18n.locale}/${this.file}`);
+        return require(`@/assets/img/banners/${this.$store.state.locale}/${this.file}`);
       } catch (e) {
         // eslint-disable-next-line import/no-dynamic-require, global-require
         return require(`@/assets/img/banners/${this.file}`);
diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index 62911ca4..0d86f775 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -41,7 +41,6 @@
 <script>
 import { required, numeric, between } from 'vuelidate/lib/validators';
 import cartMixin from '../../mixins/cartMixin';
-import priceMixin from '../../mixins/priceMixin';
 import ServerError from '../common/form/ServerError.vue';
 import LoadingButton from '../common/form/LoadingButton.vue';
 import BaseSelect from '../common/form/BaseSelect.vue';
@@ -64,7 +63,7 @@ export default {
     ServerError,
   },
 
-  mixins: [cartMixin, priceMixin],
+  mixins: [cartMixin],
 
   data: () => ({
     form: {
@@ -82,7 +81,9 @@ export default {
     async addLineItem() {
       if (!this.cartExists) {
         await this.createMyCart({
-          currency: this.currency,
+          currency: this.$store.state.currency,
+          country: this.$store.state.country,
+          shippingAddress: { country: this.$store.state.country },
         });
       }
       return this.updateMyCart({
diff --git a/src/components/productdetail/DetailsSection.vue b/src/components/productdetail/DetailsSection.vue
index a23d79fc..b5eaf335 100644
--- a/src/components/productdetail/DetailsSection.vue
+++ b/src/components/productdetail/DetailsSection.vue
@@ -177,7 +177,7 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
           sku: this.sku,
         };
       },
diff --git a/src/components/productdetail/ProductInfo.vue b/src/components/productdetail/ProductInfo.vue
index 5167968d..27b741f3 100644
--- a/src/components/productdetail/ProductInfo.vue
+++ b/src/components/productdetail/ProductInfo.vue
@@ -57,8 +57,7 @@
 
 <script>
 import gql from 'graphql-tag';
-import priceMixin from '@/mixins/priceMixin';
-import productMixin from '@/mixins/productMixin';
+import productMixin from '../../mixins/productMixin';
 import ProductGallery from './ProductGallery.vue';
 import SocialMediaLinks from './SocialMediaLinks.vue';
 import DetailsSection from './DetailsSection.vue';
@@ -66,6 +65,13 @@ import AddToCartForm from './AddToCartForm.vue';
 import BasePrice from '../common/BasePrice.vue';
 
 export default {
+  props: {
+    sku: {
+      type: String,
+      required: true,
+    },
+  },
+
   components: {
     DetailsSection,
     ProductGallery,
@@ -74,12 +80,7 @@ export default {
     BasePrice,
   },
 
-  props: {
-    sku: {
-      type: String,
-      required: true,
-    },
-  },
+  mixins: [productMixin],
 
   data: () => ({
     product: null,
@@ -91,8 +92,6 @@ export default {
     },
   },
 
-  mixins: [priceMixin, productMixin],
-
   apollo: {
     product: {
       query: gql`
@@ -126,8 +125,8 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
-          currency: this.currency,
+          locale: this.$store.state.locale,
+          currency: this.$store.state.currency,
           sku: this.sku,
         };
       },
diff --git a/src/components/productoverview/ProductList.vue b/src/components/productoverview/ProductList.vue
index d748310f..d58fed1b 100644
--- a/src/components/productoverview/ProductList.vue
+++ b/src/components/productoverview/ProductList.vue
@@ -59,13 +59,13 @@ import ProductThumbnail from '../common/ProductThumbnail.vue';
 import ProductSortSelector from './ProductSortSelector.vue';
 
 export default {
+  props: ['categorySlug'],
+
   components: {
     ProductThumbnail,
     ProductSortSelector,
   },
 
-  props: ['categorySlug'],
-
   data: () => ({
     categories: null,
     products: null,
@@ -98,7 +98,7 @@ export default {
         }`,
       variables() {
         return {
-          where: `slug(${this.$i18n.locale}="${this.categorySlug}")`,
+          where: `slug(${this.$store.state.locale}="${this.categorySlug}")`,
         };
       },
       skip: vm => !vm.categorySlug,
@@ -142,8 +142,8 @@ export default {
         }`,
       variables() {
         return {
-          locale: this.$i18n.locale,
-          currency: this.$i18n.numberFormats[this.$store.state.country].currency.currency,
+          locale: this.$store.state.locale,
+          currency: this.$store.state.currency,
           where: `masterData(current(categories(id="${this.category.id}")))`,
           sort: this.sort,
         };
diff --git a/src/components/useraccount/myorders/TabOrderDetail.vue b/src/components/useraccount/myorders/TabOrderDetail.vue
index 8f9da396..e761f37e 100644
--- a/src/components/useraccount/myorders/TabOrderDetail.vue
+++ b/src/components/useraccount/myorders/TabOrderDetail.vue
@@ -70,7 +70,7 @@ export default {
       variables() {
         return {
           orderNumber: this.$route.params.orderNumber,
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         };
       },
     },
diff --git a/src/i18n/de.yaml b/src/i18n/de.yaml
index 7016179c..deea46ce 100644
--- a/src/i18n/de.yaml
+++ b/src/i18n/de.yaml
@@ -25,9 +25,6 @@ main:
     miniCart: "Warenkorb"
     viewBag: "Warenkorb ansehen"
     checkout: "Checkout"
-    language: "Sprache"
-    country: "Land"
-    location: "Ort"
     allCategories: "Alle Kategorien"
     teaser: "Sommer 2015 – Was ist Ihre Inspiration?"
     new: "Neu"
diff --git a/src/i18n/en.yaml b/src/i18n/en.yaml
index e33a59fa..84d702b8 100644
--- a/src/i18n/en.yaml
+++ b/src/i18n/en.yaml
@@ -25,9 +25,6 @@ main:
     miniCart: "Cart"
     viewBag: "View Bag"
     checkout: "Checkout"
-    language: "Language"
-    country: "Country"
-    location: "Location"
     allCategories: "All categories"
     teaser: "Summer 2015 – What inspires you?"
     new: "New"
diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js
index 731da695..280ab609 100644
--- a/src/i18n/i18n.js
+++ b/src/i18n/i18n.js
@@ -1,11 +1,10 @@
 import Vue from 'vue';
 import VueI18n from 'vue-i18n';
+import store, { fallbackLocale } from '../store';
 import sunriseConfig from '../../sunrise.config';
 
 Vue.use(VueI18n);
 
-const fallbackLocale = sunriseConfig.languages ? Object.keys(sunriseConfig.languages)[0] : 'en';
-
 function loadMessages() {
   const locales = require.context('@/i18n', true, /[a-z0-9]+\.yaml$/i);
   const messages = {};
@@ -19,54 +18,17 @@ function loadMessages() {
   return messages;
 }
 
-function findInitialLocale() {
-  const storedLocale = localStorage.getItem('locale');
-  return storedLocale || fallbackLocale;
-}
-
-const numberFormats = {
-  'en-US': {
-    currency: {
-      style: 'currency', currency: 'USD'
-    }
-  },
-  'de-DE': {
-    currency: {
-      style: 'currency', currency: 'EUR', currencyDisplay: 'symbol'
-    }
-  }
-};
-
-const dateTimeFormats = {
-  'en-US': {
-    short: {
-      year: 'numeric',
-      month: 'short',
-      day: 'numeric'
-    }
-  },
-
-  'de-DE': {
-    short: {
-      year: 'numeric',
-      month: 'short',
-      day: 'numeric'
-    }
-  }
-};
-
-// Create VueI18n instance with options
 const i18n = new VueI18n({
-  locale: findInitialLocale(),
+  locale: store.state.locale,
   fallbackLocale,
   messages: loadMessages(),
-  numberFormats,
-  dateTimeFormats,
+  numberFormats: sunriseConfig.formats.number,
+  dateTimeFormats: sunriseConfig.formats.datetime,
 });
 
-i18n.vm.$watch('locale', (locale) => {
-  document.documentElement.lang = locale;
-  localStorage.setItem('locale', locale);
+store.watch((state) => state.locale, (value) => {
+  i18n.locale = value;
+  document.documentElement.lang = value;
 });
 
-export default i18n;
\ No newline at end of file
+export default i18n;
diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index 200096c7..84eab7bf 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -52,12 +52,12 @@ export default {
           actions,
           id: this.me.activeCart?.id,
           version: this.me.activeCart?.version,
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         },
       });
     },
 
-    createMyCart(draft) {
+    createMyaCart(draft) {
       return this.$apollo.mutate({
         mutation: gql`
           mutation ($draft: MyCartDraft!) {
@@ -89,7 +89,7 @@ export default {
         variables: {
           id: this.me.activeCart?.id,
           version: this.me.activeCart?.version,
-          locale: this.$i18n.locale,
+          locale: this.$store.state.locale,
         },
         update: (store) => {
           const data = store.readQuery({ query: BASIC_CART_QUERY });
diff --git a/src/mixins/priceMixin.js b/src/mixins/priceMixin.js
deleted file mode 100644
index 4608720d..00000000
--- a/src/mixins/priceMixin.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const numberFormats = {
-  'en-US': {
-    currency: {
-      style: 'currency', currency: 'USD',
-    },
-  },
-  'de-DE': {
-    currency: {
-      style: 'currency', currency: 'EUR', currencyDisplay: 'symbol',
-    },
-  },
-};
-
-export default {
-  computed: {
-    currency() {
-      return numberFormats[this.$store.state.country].currency.currency;
-    },
-  },
-};
diff --git a/src/store.js b/src/store.js
index 6b8cce93..6b90277e 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,11 +1,24 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
+import createPersistedState from 'vuex-persistedstate';
+import sunriseConfig from '../sunrise.config';
 
 Vue.use(Vuex);
 
+const SET_LOCALE = 'SET_LOCALE';
+const SET_COUNTRY = 'SET_COUNTRY';
+const SET_CURRENCY = 'SET_CURRENCY';
 const SET_AUTHENTICATED = 'SET_AUTHENTICATED';
+const SET_TOKEN_INFO = 'SET_TOKEN_INFO';
 const SET_MINI_CART_OPEN = 'SET_MINI_CART_OPEN';
 
+const availableLocales = Object.keys(sunriseConfig.languages);
+const availableCountries = Object.keys(sunriseConfig.countries);
+
+export const fallbackLocale = availableLocales[0];
+const fallbackCountry = availableCountries[0];
+const obtainCurrency = country => sunriseConfig.formats.number[country]?.currency?.currency;
+
 const clearMiniCartTimeout = (state) => {
   if (state.miniCartCloseTimer !== 0) {
     clearTimeout(state.miniCartCloseTimer);
@@ -17,20 +30,42 @@ const setMiniCartTimeout = (commit, state, timeout) => {
 };
 
 export default new Vuex.Store({
+  plugins: [createPersistedState({
+    key: 'session',
+    paths: ['locale', 'country', 'currency', 'tokenInfo', 'authenticated'],
+  })],
+
   state: {
-    country: 'de-DE',
+    locale: fallbackLocale,
+    country: fallbackCountry,
+    currency: obtainCurrency(fallbackCountry),
+    tokenInfo: null,
     authenticated: false,
     miniCartOpen: false,
     miniCartCloseTimer: 0,
   },
 
-  getters: {
+  actions: {
+    setLocale: ({ commit }, locale) => {
+      if (availableLocales.includes(locale)) commit(SET_LOCALE, locale);
+    },
 
-  },
+    setCountry: ({ commit }, country) => {
+      if (availableCountries.includes(country)) {
+        commit(SET_COUNTRY, country);
+        commit(SET_CURRENCY, obtainCurrency(country));
+      }
+    },
 
-  actions: {
     setAuthenticated: ({ commit }, authenticated) => commit(SET_AUTHENTICATED, authenticated),
 
+    setTokenInfo: ({ commit }, tokenInfo) => commit(SET_TOKEN_INFO, tokenInfo),
+
+    clearAuthentication: ({ commit }) => {
+      commit(SET_TOKEN_INFO, null);
+      commit(SET_AUTHENTICATED, false);
+    },
+
     openMiniCart: ({ commit, state }, timeout = 2000) => {
       clearMiniCartTimeout(state);
       commit(SET_MINI_CART_OPEN, true);
@@ -52,10 +87,26 @@ export default new Vuex.Store({
   },
 
   mutations: {
+    [SET_COUNTRY](state, country) {
+      state.country = country;
+    },
+
+    [SET_CURRENCY](state, currency) {
+      state.currency = currency;
+    },
+
+    [SET_LOCALE](state, locale) {
+      state.locale = locale;
+    },
+
     [SET_AUTHENTICATED](state, authenticated) {
       state.authenticated = authenticated;
     },
 
+    [SET_TOKEN_INFO](state, tokenInfo) {
+      state.tokenInfo = tokenInfo;
+    },
+
     [SET_MINI_CART_OPEN](state, miniCartOpen) {
       state.miniCartOpen = miniCartOpen;
     },
diff --git a/sunrise.config.js b/sunrise.config.js
index a5106d94..95f5513d 100644
--- a/sunrise.config.js
+++ b/sunrise.config.js
@@ -17,6 +17,43 @@ export default {
     en: 'English',
     de: 'Deutsch',
   },
+  countries: {
+    DE: 'Deutschland',
+    US: 'United States',
+  },
+  formats: {
+    number: {
+      DE: {
+        currency: {
+          style: 'currency',
+          currency: 'EUR',
+          currencyDisplay: 'symbol',
+        },
+      },
+      US: {
+        currency: {
+          style: 'currency',
+          currency: 'USD',
+        },
+      },
+    },
+    datetime: {
+      US: {
+        short: {
+          year: 'numeric',
+          month: 'short',
+          day: 'numeric',
+        },
+      },
+      DE: {
+        short: {
+          year: 'numeric',
+          month: 'short',
+          day: 'numeric',
+        },
+      },
+    },
+  },
   categories: {
     salesExternalId: '6',
   },
diff --git a/yarn.lock b/yarn.lock
index e77f5df1..7f34761d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4487,7 +4487,7 @@ deepmerge@^1.5.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
   integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
 
-deepmerge@^2.1.1, deepmerge@^2.2.1:
+deepmerge@^2.1.0, deepmerge@^2.1.1, deepmerge@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
   integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
@@ -11066,6 +11066,11 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+shvl@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/shvl/-/shvl-1.3.1.tgz#6c20a17b4a20b08e9f8cab60c50a92229fcc176e"
+  integrity sha512-+rRPP46hloYUAEImJcqprUgXu+05Ikqr4h4V+w5i2zJy37nAqtkQKufs3+3S2fDq6JNRrHMIQhB/Vaex+jgAAw==
+
 sigmund@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -12466,6 +12471,14 @@ vuelidate@^0.7.4:
   resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.4.tgz#5a0e54be09ac0192f1aa3387d74b92e0945bf8aa"
   integrity sha512-QHZWYOL325Zo+2K7VBNEJTZ496Kd8Z31p85aQJFldKudUUGBmgw4zu4ghl4CyqPwjRCmqZ9lDdx4FSdMnu4fGg==
 
+vuex-persistedstate@^2.5.4:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-2.5.4.tgz#a19710ad7f9a08cea4e65fc585924d9fdac7384a"
+  integrity sha512-XYJhKIwO+ZVlTaXyxKxnplrJ88Fnvk5aDw753bxzRw5/yMKLQ6lq9CDCBex2fwZaQcLibhtgJOxGCHjy9GLSlQ==
+  dependencies:
+    deepmerge "^2.1.0"
+    shvl "^1.3.0"
+
 vuex@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.1.tgz#0c264bfe30cdbccf96ab9db3177d211828a5910e"

From 3336136eff96805f55945d9210b4773792f07854 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 24 Sep 2019 17:56:53 +0200
Subject: [PATCH 50/69] Fix typo

---
 src/mixins/cartMixin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/cartMixin.js b/src/mixins/cartMixin.js
index 84eab7bf..d7e1d0da 100644
--- a/src/mixins/cartMixin.js
+++ b/src/mixins/cartMixin.js
@@ -57,7 +57,7 @@ export default {
       });
     },
 
-    createMyaCart(draft) {
+    createMyCart(draft) {
       return this.$apollo.mutate({
         mutation: gql`
           mutation ($draft: MyCartDraft!) {

From ebf021f4ab3ef3fc66295a62ba664803bff33f67 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Tue, 24 Sep 2019 17:57:25 +0200
Subject: [PATCH 51/69] Log error in console when server error instead of
 hiding it

---
 src/components/common/form/ServerError.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/common/form/ServerError.vue b/src/components/common/form/ServerError.vue
index eb563db3..f345626e 100644
--- a/src/components/common/form/ServerError.vue
+++ b/src/components/common/form/ServerError.vue
@@ -38,6 +38,12 @@ export default {
       return this.isGraphQLError ? this.error.graphQLErrors : [];
     },
   },
+
+  watch: {
+    error(value) {
+      if (value && !this.isGraphQLError) console.error(value);
+    },
+  },
 };
 </script>
 

From c8a28084fae6165582ed1f62b74126618af8c2a7 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 7 Oct 2019 16:16:43 +0200
Subject: [PATCH 52/69] Update .lock files

---
 package-lock.json | 2540 ++++++++++++++++++++++-----------------------
 yarn.lock         | 2365 +++++++++++++++++++++--------------------
 2 files changed, 2468 insertions(+), 2437 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8cf02b97..502124a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@apollographql/apollo-tools": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.3.7.tgz",
-      "integrity": "sha512-+ertvzAwzkYmuUtT8zH3Zi6jPdyxZwOgnYaZHY7iLnMVJDhQKWlkyjLMF8wyzlPiEdDImVUMm5lOIBZo7LkGlg==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.0.tgz",
+      "integrity": "sha512-7wEO+S+zgz/wVe3ilFQqICufRBYYDSNUkd1V03JWvXuSydbYq2SM5EgvWmFF+04iadt+aQ0XCCsRzCzRPQODfQ==",
       "requires": {
         "apollo-env": "0.5.1"
       }
@@ -27,18 +27,18 @@
       }
     },
     "@babel/core": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
-      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.2.tgz",
+      "integrity": "sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.5.5",
-        "@babel/helpers": "^7.5.5",
-        "@babel/parser": "^7.5.5",
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.5",
-        "@babel/types": "^7.5.5",
+        "@babel/generator": "^7.6.2",
+        "@babel/helpers": "^7.6.2",
+        "@babel/parser": "^7.6.2",
+        "@babel/template": "^7.6.0",
+        "@babel/traverse": "^7.6.2",
+        "@babel/types": "^7.6.0",
         "convert-source-map": "^1.1.0",
         "debug": "^4.1.0",
         "json5": "^2.1.0",
@@ -72,16 +72,15 @@
       }
     },
     "@babel/generator": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
-      "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz",
+      "integrity": "sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.5.5",
+        "@babel/types": "^7.6.0",
         "jsesc": "^2.5.1",
         "lodash": "^4.17.13",
-        "source-map": "^0.5.0",
-        "trim-right": "^1.0.1"
+        "source-map": "^0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -129,9 +128,9 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz",
-      "integrity": "sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz",
+      "integrity": "sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
@@ -304,14 +303,14 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
-      "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
+      "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.5",
-        "@babel/types": "^7.5.5"
+        "@babel/template": "^7.6.0",
+        "@babel/traverse": "^7.6.2",
+        "@babel/types": "^7.6.0"
       }
     },
     "@babel/highlight": {
@@ -326,9 +325,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
-      "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz",
+      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
@@ -353,12 +352,12 @@
       }
     },
     "@babel/plugin-proposal-decorators": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz",
-      "integrity": "sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.6.0.tgz",
+      "integrity": "sha512-ZSyYw9trQI50sES6YxREXKu+4b7MAg6Qx2cvyDDYjP2Hpzd3FleOUwC9cqn1+za8d0A2ZU8SHujxFao956efUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.4.4",
+        "@babel/helper-create-class-features-plugin": "^7.6.0",
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-syntax-decorators": "^7.2.0"
       }
@@ -385,9 +384,9 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz",
-      "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz",
+      "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -405,23 +404,23 @@
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz",
-      "integrity": "sha512-ea3Q6edZC/55wEBVZAEz42v528VulyO0eir+7uky/sT4XRcdkWJcFi1aPtitTlwUzGnECWJNExWww1SStt+yWw==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.6.0.tgz",
+      "integrity": "sha512-kj4gkZ6qUggkprRq3Uh5KP8XnE1MdIO0J7MhdDX8+rAbB6dJ2UrensGIS+0NPZAaaJ1Vr0PN6oLUgXMU1uMcSg==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-syntax-optional-chaining": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz",
-      "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz",
+      "integrity": "sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -525,9 +524,9 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz",
-      "integrity": "sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz",
+      "integrity": "sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -560,23 +559,23 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz",
-      "integrity": "sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz",
+      "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz",
-      "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz",
+      "integrity": "sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
@@ -648,9 +647,9 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz",
-      "integrity": "sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
+      "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
       "dev": true,
       "requires": {
         "@babel/helper-module-transforms": "^7.4.4",
@@ -681,12 +680,12 @@
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz",
-      "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz",
+      "integrity": "sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g==",
       "dev": true,
       "requires": {
-        "regexp-tree": "^0.1.6"
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/plugin-transform-new-target": {
@@ -760,9 +759,9 @@
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz",
-      "integrity": "sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz",
+      "integrity": "sha512-cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
@@ -781,9 +780,9 @@
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
-      "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz",
+      "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
@@ -819,20 +818,20 @@
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz",
-      "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz",
+      "integrity": "sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/preset-env": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz",
-      "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.6.2.tgz",
+      "integrity": "sha512-Ru7+mfzy9M1/YTEtlDS8CD45jd22ngb9tXnn64DvQK3ooyqSw9K4K9DUWmYknTTVk4TqygL9dqCrZgm1HMea/Q==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -841,9 +840,9 @@
         "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
         "@babel/plugin-proposal-dynamic-import": "^7.5.0",
         "@babel/plugin-proposal-json-strings": "^7.2.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
         "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.6.2",
         "@babel/plugin-syntax-async-generators": "^7.2.0",
         "@babel/plugin-syntax-dynamic-import": "^7.2.0",
         "@babel/plugin-syntax-json-strings": "^7.2.0",
@@ -852,11 +851,11 @@
         "@babel/plugin-transform-arrow-functions": "^7.2.0",
         "@babel/plugin-transform-async-to-generator": "^7.5.0",
         "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
-        "@babel/plugin-transform-block-scoping": "^7.5.5",
+        "@babel/plugin-transform-block-scoping": "^7.6.2",
         "@babel/plugin-transform-classes": "^7.5.5",
         "@babel/plugin-transform-computed-properties": "^7.2.0",
-        "@babel/plugin-transform-destructuring": "^7.5.0",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/plugin-transform-destructuring": "^7.6.0",
+        "@babel/plugin-transform-dotall-regex": "^7.6.2",
         "@babel/plugin-transform-duplicate-keys": "^7.5.0",
         "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
         "@babel/plugin-transform-for-of": "^7.4.4",
@@ -864,10 +863,10 @@
         "@babel/plugin-transform-literals": "^7.2.0",
         "@babel/plugin-transform-member-expression-literals": "^7.2.0",
         "@babel/plugin-transform-modules-amd": "^7.5.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.5.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.6.0",
         "@babel/plugin-transform-modules-systemjs": "^7.5.0",
         "@babel/plugin-transform-modules-umd": "^7.2.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.6.2",
         "@babel/plugin-transform-new-target": "^7.4.4",
         "@babel/plugin-transform-object-super": "^7.5.5",
         "@babel/plugin-transform-parameters": "^7.4.4",
@@ -875,12 +874,12 @@
         "@babel/plugin-transform-regenerator": "^7.4.5",
         "@babel/plugin-transform-reserved-words": "^7.2.0",
         "@babel/plugin-transform-shorthand-properties": "^7.2.0",
-        "@babel/plugin-transform-spread": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.6.2",
         "@babel/plugin-transform-sticky-regex": "^7.2.0",
         "@babel/plugin-transform-template-literals": "^7.4.4",
         "@babel/plugin-transform-typeof-symbol": "^7.2.0",
-        "@babel/plugin-transform-unicode-regex": "^7.4.4",
-        "@babel/types": "^7.5.5",
+        "@babel/plugin-transform-unicode-regex": "^7.6.2",
+        "@babel/types": "^7.6.0",
         "browserslist": "^4.6.0",
         "core-js-compat": "^3.1.1",
         "invariant": "^2.2.2",
@@ -889,18 +888,18 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
-      "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.2.tgz",
+      "integrity": "sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.2"
       }
     },
     "@babel/runtime-corejs2": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.5.5.tgz",
-      "integrity": "sha512-FYATQVR00NSNi7mUfpPDp7E8RYMXDuO8gaix7u/w3GekfUinKgX1AcTxs7SoiEmoEW9mbpjrwqWSW6zCmw5h8A==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.6.2.tgz",
+      "integrity": "sha512-wdyVKnTv9Be4YlwF/7pByYNfcl23qC21aAQ0aIaZOo2ZOvhFEyJdBLJClYZ9i+Pmrz7sUQgg/MwbJa2RZTkygg==",
       "dev": true,
       "requires": {
         "core-js": "^2.6.5",
@@ -908,28 +907,28 @@
       }
     },
     "@babel/template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
-      "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
+      "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/parser": "^7.6.0",
+        "@babel/types": "^7.6.0"
       }
     },
     "@babel/traverse": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
-      "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz",
+      "integrity": "sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.5.5",
+        "@babel/generator": "^7.6.2",
         "@babel/helper-function-name": "^7.1.0",
         "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.5.5",
-        "@babel/types": "^7.5.5",
+        "@babel/parser": "^7.6.2",
+        "@babel/types": "^7.6.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.13"
@@ -953,9 +952,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
-      "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+      "version": "7.6.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz",
+      "integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2",
@@ -1102,76 +1101,68 @@
       }
     },
     "@fortawesome/fontawesome-common-types": {
-      "version": "0.2.19",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.19.tgz",
-      "integrity": "sha512-nd2Ul/CUs8U9sjofQYAALzOGpgkVJQgEhIJnOHaoyVR/LeC3x2mVg4eB910a4kS6WgLPebAY0M2fApEI497raQ=="
+      "version": "0.2.25",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.25.tgz",
+      "integrity": "sha512-3RuZPDuuPELd7RXtUqTCfed14fcny9UiPOkdr2i+cYxBoTOfQgxcDoq77fHiiHcgWuo1LoBUpvGxFF1H/y7s3Q=="
     },
     "@fortawesome/fontawesome-svg-core": {
-      "version": "1.2.19",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.19.tgz",
-      "integrity": "sha512-D4ICXg9oU08eF9o7Or392gPpjmwwgJu8ecCFusthbID95CLVXOgIyd4mOKD9Nud5Ckz+Ty59pqkNtThDKR0erA==",
+      "version": "1.2.25",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.25.tgz",
+      "integrity": "sha512-MotKnn53JKqbkLQiwcZSBJVYtTgIKFbh7B8+kd05TSnfKYPFmjKKI59o2fpz5t0Hzl35vVGU6+N4twoOpZUrqA==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.19"
+        "@fortawesome/fontawesome-common-types": "^0.2.25"
       }
     },
     "@fortawesome/free-solid-svg-icons": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.9.0.tgz",
-      "integrity": "sha512-U8YXPfWcSozsCW0psCtlRGKjjRs5+Am5JJwLOUmVHFZbIEWzaz4YbP84EoPwUsVmSAKrisu3QeNcVOtmGml0Xw==",
+      "version": "5.11.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz",
+      "integrity": "sha512-zBue4i0PAZJUXOmLBBvM7L0O7wmsDC8dFv9IhpW5QL4kT9xhhVUsYg/LX1+5KaukWq4/cbDcKT+RT1aRe543sg==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "^0.2.19"
+        "@fortawesome/fontawesome-common-types": "^0.2.25"
       }
     },
     "@fortawesome/vue-fontawesome": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.6.tgz",
-      "integrity": "sha512-HAGRbrOuGDwwUmCYdpzR0hhNQ3EE30dOS4JiJKcoZ+S4M210CxyU0OXCgzIg3HzK/23rlpHbV8zi9PDDZDnuIw=="
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.7.tgz",
+      "integrity": "sha512-YCw2Q2m4fxzyFsPOH3uDYMoJztTD+pT+AAyse4LFpbdrBg+r8ueaVT8BFnXEjrGwMDJJeXrwJ5AOC6q/JWBI4w=="
     },
     "@hapi/address": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz",
-      "integrity": "sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz",
+      "integrity": "sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==",
+      "dev": true
+    },
+    "@hapi/bourne": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
+      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==",
       "dev": true
     },
     "@hapi/hoek": {
-      "version": "6.2.4",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-6.2.4.tgz",
-      "integrity": "sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.3.0.tgz",
+      "integrity": "sha512-C0QL9bmgUXTSuf8nDeGrpMjtJG7tPUr8wG6/wxPbP62tGwCwQtdMSJYfESowmY4P3Hn593f+8OzNY5bckcu/LQ==",
       "dev": true
     },
     "@hapi/joi": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.0.tgz",
-      "integrity": "sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
+      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
       "dev": true,
       "requires": {
         "@hapi/address": "2.x.x",
-        "@hapi/hoek": "6.x.x",
-        "@hapi/marker": "1.x.x",
+        "@hapi/bourne": "1.x.x",
+        "@hapi/hoek": "8.x.x",
         "@hapi/topo": "3.x.x"
       }
     },
-    "@hapi/marker": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@hapi/marker/-/marker-1.0.0.tgz",
-      "integrity": "sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA==",
-      "dev": true
-    },
     "@hapi/topo": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.2.tgz",
-      "integrity": "sha512-r+aumOqJ5QbD6aLPJWqVjMAPsx5pZKz+F5yPqXZ/WWG9JTtHbQqlzrJoknJ0iJxLj9vlXtmpSdjlkszseeG8OA==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.5.tgz",
+      "integrity": "sha512-bi9m1jrui9LlvtVdLaHv0DqeOoe+I8dep+nEcTgW6XxJHL3xArQcilYz3tIp0cRC4gWlsVtABK7vNKg4jzEmAA==",
       "dev": true,
       "requires": {
         "@hapi/hoek": "8.x.x"
-      },
-      "dependencies": {
-        "@hapi/hoek": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.0.2.tgz",
-          "integrity": "sha512-O6o6mrV4P65vVccxymuruucb+GhP2zl9NLCG8OdoFRS8BEGw3vwpPp20wpAtpbQQxz1CEUtmxJGgWhjq1XA3qw==",
-          "dev": true
-        }
       }
     },
     "@intervolga/optimize-cssnano-plugin": {
@@ -1326,9 +1317,9 @@
       }
     },
     "@types/body-parser": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz",
-      "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz",
+      "integrity": "sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==",
       "requires": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -1342,10 +1333,21 @@
         "@types/node": "*"
       }
     },
+    "@types/cookies": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz",
+      "integrity": "sha512-oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw==",
+      "requires": {
+        "@types/connect": "*",
+        "@types/express": "*",
+        "@types/keygrip": "*",
+        "@types/node": "*"
+      }
+    },
     "@types/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==",
+      "version": "2.8.6",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.6.tgz",
+      "integrity": "sha512-invOmosX0DqbpA+cE2yoHGUlF/blyf7nB0OGYBBiH27crcVm5NmFaZkLP4Ta1hGaesckCi5lVLlydNJCxkTOSg==",
       "requires": {
         "@types/express": "*"
       }
@@ -1353,12 +1355,13 @@
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+      "dev": true
     },
     "@types/express": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz",
-      "integrity": "sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==",
       "requires": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "*",
@@ -1366,14 +1369,22 @@
       }
     },
     "@types/express-serve-static-core": {
-      "version": "4.16.7",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz",
-      "integrity": "sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==",
+      "version": "4.16.9",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz",
+      "integrity": "sha512-GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==",
       "requires": {
         "@types/node": "*",
         "@types/range-parser": "*"
       }
     },
+    "@types/fs-capacitor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz",
+      "integrity": "sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/glob": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
@@ -1385,6 +1396,48 @@
         "@types/node": "*"
       }
     },
+    "@types/graphql-upload": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.3.tgz",
+      "integrity": "sha512-hmLg9pCU/GmxBscg8GCr1vmSoEmbItNNxdD5YH2TJkXm//8atjwuprB+xJBK714JG1dkxbbhp5RHX+Pz1KsCMA==",
+      "requires": {
+        "@types/express": "*",
+        "@types/fs-capacitor": "*",
+        "@types/koa": "*",
+        "graphql": "^14.5.3"
+      }
+    },
+    "@types/http-assert": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz",
+      "integrity": "sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ=="
+    },
+    "@types/keygrip": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.1.tgz",
+      "integrity": "sha1-/1QEYtL7TQqIRBzq8n0oewHD2Hg="
+    },
+    "@types/koa": {
+      "version": "2.0.50",
+      "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.0.50.tgz",
+      "integrity": "sha512-TcgOD2lh0EISSadAk1DOBYw7kNoY9XdeB3vEMOKiDDaTMYm+V54nyPsU7Ulb/htb5OBIR79RgTeCWntCcophLw==",
+      "requires": {
+        "@types/accepts": "*",
+        "@types/cookies": "*",
+        "@types/http-assert": "*",
+        "@types/keygrip": "*",
+        "@types/koa-compose": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/koa-compose": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.4.tgz",
+      "integrity": "sha512-ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA==",
+      "requires": {
+        "@types/koa": "*"
+      }
+    },
     "@types/long": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz",
@@ -1402,9 +1455,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "12.6.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz",
-      "integrity": "sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg=="
+      "version": "12.7.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.11.tgz",
+      "integrity": "sha512-Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -1424,9 +1477,9 @@
       "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
     },
     "@types/serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==",
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz",
+      "integrity": "sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==",
       "requires": {
         "@types/express-serve-static-core": "*",
         "@types/mime": "*"
@@ -1445,11 +1498,10 @@
       "dev": true
     },
     "@types/ws": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.1.tgz",
-      "integrity": "sha512-EzH8k1gyZ4xih/MaZTXwT2xOkPiIMSrhQ9b8wrlX88L0T02eYsddatQlwVFlEPyEqV0ChpdpNnE51QPH6NVT4Q==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz",
+      "integrity": "sha512-yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==",
       "requires": {
-        "@types/events": "*",
         "@types/node": "*"
       }
     },
@@ -1479,9 +1531,9 @@
       }
     },
     "@vue/babel-preset-app": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-3.9.2.tgz",
-      "integrity": "sha512-0suuCbu4jkVcVYBjPmuKxeDbrhwThYZHu3DUmtsVuOzFEGeXmco60VmXveniL/bnDUdZyknSuYP4FxgS34gw9w==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-3.11.0.tgz",
+      "integrity": "sha512-fcCq9nuGGx1WGnyaKHvIC8RnWjISXGf1rJH4mN9+bymDfosgDbwnfV4TYvTZlyK1/aTHEEpIoO3XimTXBo7QBw==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
@@ -1553,9 +1605,9 @@
       }
     },
     "@vue/babel-preset-jsx": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.0.0.tgz",
-      "integrity": "sha512-5CbDu/QHS+TtQNw5aYAffiMxBBB2Eo9+RJpS8X+6FJbdG5Rvc4TVipEqkrg0pJviWadNg7TEy0Uz4o7VNXeIZw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.0.tgz",
+      "integrity": "sha512-EeZ9gwEmu79B4A6LMLAw5cPCVYIcbKWgJgJafWtLzh1S+SgERUmTkVQ9Vx4k8zYBiCuxHK3XziZ3VJIMau7THA==",
       "dev": true,
       "requires": {
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
@@ -1563,7 +1615,7 @@
         "@vue/babel-sugar-functional-vue": "^1.0.0",
         "@vue/babel-sugar-inject-h": "^1.0.0",
         "@vue/babel-sugar-v-model": "^1.0.0",
-        "@vue/babel-sugar-v-on": "^1.0.0"
+        "@vue/babel-sugar-v-on": "^1.1.0"
       }
     },
     "@vue/babel-sugar-functional-vue": {
@@ -1599,9 +1651,9 @@
       }
     },
     "@vue/babel-sugar-v-on": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.0.0.tgz",
-      "integrity": "sha512-2aqJaDLKdSSGlxZU+GjFERaSNUaa6DQreV+V/K4W/6Lxj8520/r1lChWEa/zuAoPD2Vhy0D2QrqqO+I0D6CkKw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.0.tgz",
+      "integrity": "sha512-8DwAj/RLpmrDP4eZ3erJcKcyuLArLUYagNODTsSQrMdG5zmLJoFFtEjODfYRh/XxM2wXv9Wxe+HAB41FQxxwQA==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-jsx": "^7.2.0",
@@ -1610,48 +1662,48 @@
       }
     },
     "@vue/cli-overlay": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-3.9.0.tgz",
-      "integrity": "sha512-QfyvpJl2ChehBT2qzb5EvW921JxW94uFL3+lHa6VT42ImH8awrvkTGZmxTQWhHvATa7r0LKy7M7ZRMyo547esg==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-3.11.0.tgz",
+      "integrity": "sha512-yYZP27vjioWmohwXQ9mTPHHxktfAaTM6RDehyG83yvY07wcdxhwrNNCMm8eE9My/K2F8oAPf8uoDZZmkr/EXBw==",
       "dev": true
     },
     "@vue/cli-plugin-babel": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-3.9.2.tgz",
-      "integrity": "sha512-XqfmGjUGnnJ3NA+HC31F6nkBvB9pFDhk4Lxeao8ZNJcEjKNEBYjlmHunJQdIe/jEXXum6U+U/ZE6DjDStHTIMw==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-3.11.0.tgz",
+      "integrity": "sha512-RSq9goefilvUMYxbeQS8cZxt6zZnvBIb1xK4NWX0NBtqKzJmIjtJzDAQvKgjnZ/USRu6p6X2IRj4Wum8UCUqow==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.0.0",
-        "@vue/babel-preset-app": "^3.9.2",
-        "@vue/cli-shared-utils": "^3.9.0",
+        "@vue/babel-preset-app": "^3.11.0",
+        "@vue/cli-shared-utils": "^3.11.0",
         "babel-loader": "^8.0.5",
-        "webpack": ">=4 < 4.29"
+        "webpack": "^4.0.0"
       }
     },
     "@vue/cli-plugin-e2e-cypress": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-3.9.0.tgz",
-      "integrity": "sha512-OMBl81ZDKvxZRSb3M/VWSFpbngcwcubi2MF/Qi+BGz+8CLdfJuPUqKR1CR36pUjn2WGb4B8hsC/lkCqlrYCG3g==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-3.11.0.tgz",
+      "integrity": "sha512-k7oT2/sxCSC/ZuHTSbp5VeBu5YnAfmiplS96aoF5JatAi8oP+x58qLc+pBFT1DP1IqacP1U/685v0pJQjo5Ztg==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^3.9.0",
+        "@vue/cli-shared-utils": "^3.11.0",
         "cypress": "^3.2.0",
         "eslint-plugin-cypress": "^2.2.1"
       }
     },
     "@vue/cli-plugin-eslint": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.9.2.tgz",
-      "integrity": "sha512-AdvWJN+4Px2r3hbTDM2/rCtTcS6VyI7XuRljbfr2V9nF9cJiH4qsXFrTCRj3OgupbXJ14fUGKrLxmznLZIm1jA==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.11.0.tgz",
+      "integrity": "sha512-cZWTXFbMu7/Ha6uAyvFsOxjC82afmHk0M9ye2MyeXmkvdL+tB2rcIITbd9HZypPaky1qv46Mp5l/lSd9W4PVCA==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^3.9.0",
+        "@vue/cli-shared-utils": "^3.11.0",
         "babel-eslint": "^10.0.1",
         "eslint": "^4.19.1",
         "eslint-loader": "^2.1.2",
         "eslint-plugin-vue": "^4.7.1",
         "globby": "^9.2.0",
-        "webpack": ">=4 < 4.29",
+        "webpack": "^4.0.0",
         "yorkie": "^2.0.0"
       },
       "dependencies": {
@@ -1668,6 +1720,18 @@
             "json-schema-traverse": "^0.3.0"
           }
         },
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -1770,23 +1834,23 @@
       }
     },
     "@vue/cli-plugin-pwa": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-pwa/-/cli-plugin-pwa-3.9.0.tgz",
-      "integrity": "sha512-wOoSePJ7nbWiV8jRAt2i5IM3pWrf2TQZMcaf062wMLva/cLDOivENDGOWxL8kkCjfduQGXUkFYtqZCT1QKph8g==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-pwa/-/cli-plugin-pwa-3.11.0.tgz",
+      "integrity": "sha512-Ua215xZRSM4LeSa2BOiHGRxcYxCcX+J0RoiflTsUhMEICJj0kwGvcjHcq8MsrmydXqHSdAKtVVJpe2CUZix2XQ==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^3.9.0",
-        "webpack": ">=4 < 4.29",
+        "@vue/cli-shared-utils": "^3.11.0",
+        "webpack": "^4.0.0",
         "workbox-webpack-plugin": "^3.6.3"
       }
     },
     "@vue/cli-plugin-unit-jest": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-3.9.0.tgz",
-      "integrity": "sha512-FzUeTXXM7VUbjNDrqbj/AoUXZd0FZVrW936VO0W57r7uDgv+bh5hcEyzZnOaqFUOHYNFhl0RYD528/Uq5Dgm0A==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-3.11.0.tgz",
+      "integrity": "sha512-UwdySXhSar9npsYmLJ45Rk4kljOwNQDHRMvmWtGIUqmES0wBYsWLed3dpcumTXTsumXrVdrY6o74L9yqCNT/xw==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^3.9.0",
+        "@vue/cli-shared-utils": "^3.11.0",
         "babel-jest": "^23.6.0",
         "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
         "jest": "^23.6.0",
@@ -1797,16 +1861,16 @@
       }
     },
     "@vue/cli-service": {
-      "version": "3.9.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.9.3.tgz",
-      "integrity": "sha512-CZE9PP4HH9bK4qAaLbTUB3tubggI+aRSbgB/QYSZrVlhtMpuVFZPj2QHbIvJQZTI2cG6LFQtLTZWXKeqo5lbAQ==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.11.0.tgz",
+      "integrity": "sha512-HSU4wHlYKQt8O968JUz/AeYvFSokxJjMkr7dgVNVb6rpBn859Emkr960plWGr1z1hc3qNOwLuSUGk5OSfq1inA==",
       "dev": true,
       "requires": {
         "@intervolga/optimize-cssnano-plugin": "^1.0.5",
         "@soda/friendly-errors-webpack-plugin": "^1.7.1",
-        "@vue/cli-overlay": "^3.9.0",
-        "@vue/cli-shared-utils": "^3.9.0",
-        "@vue/component-compiler-utils": "^2.6.0",
+        "@vue/cli-overlay": "^3.11.0",
+        "@vue/cli-shared-utils": "^3.11.0",
+        "@vue/component-compiler-utils": "^3.0.0",
         "@vue/preload-webpack-plugin": "^1.1.0",
         "@vue/web-component-wrapper": "^1.2.0",
         "acorn": "^6.1.1",
@@ -1853,19 +1917,13 @@
         "thread-loader": "^2.1.2",
         "url-loader": "^1.1.2",
         "vue-loader": "^15.7.0",
-        "webpack": ">=4 < 4.29",
+        "webpack": "^4.0.0",
         "webpack-bundle-analyzer": "^3.3.0",
         "webpack-chain": "^4.11.0",
         "webpack-dev-server": "^3.4.1",
         "webpack-merge": "^4.2.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-          "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
-          "dev": true
-        },
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
@@ -1940,9 +1998,9 @@
           }
         },
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
         "string-width": {
@@ -1979,9 +2037,9 @@
       }
     },
     "@vue/cli-shared-utils": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz",
-      "integrity": "sha512-wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.11.0.tgz",
+      "integrity": "sha512-D7pst/4v9H1DD66fLxlZOwRR09R03MV0ROdKxBHmh3FmnApCA/RiaolFA/8w+B3CnevYMlV3SJ5fOAgedbswbA==",
       "dev": true,
       "requires": {
         "@hapi/joi": "^15.0.1",
@@ -2008,17 +2066,17 @@
           }
         },
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
     "@vue/component-compiler-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz",
-      "integrity": "sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz",
+      "integrity": "sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw==",
       "dev": true,
       "requires": {
         "consolidate": "^0.15.1",
@@ -2044,9 +2102,9 @@
       }
     },
     "@vue/preload-webpack-plugin": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.0.tgz",
-      "integrity": "sha512-rcn2KhSHESBFMPj5vc5X2pI9bcBNQQixvJXhD5gZ4rN2iym/uH2qfDSQfUS5+qwiz0a85TCkeUs6w6jxFDudbw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz",
+      "integrity": "sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==",
       "dev": true
     },
     "@vue/test-utils": {
@@ -2066,175 +2124,179 @@
       "dev": true
     },
     "@webassemblyjs/ast": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
-      "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/wast-parser": "1.7.11"
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz",
-      "integrity": "sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz",
-      "integrity": "sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz",
-      "integrity": "sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz",
-      "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.7.11"
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz",
-      "integrity": "sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz",
-      "integrity": "sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==",
-      "dev": true
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz",
-      "integrity": "sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz",
-      "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-buffer": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/wasm-gen": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz",
-      "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz",
-      "integrity": "sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
       "dev": true,
       "requires": {
-        "@xtuc/long": "4.2.1"
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz",
-      "integrity": "sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz",
-      "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-buffer": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/helper-wasm-section": "1.7.11",
-        "@webassemblyjs/wasm-gen": "1.7.11",
-        "@webassemblyjs/wasm-opt": "1.7.11",
-        "@webassemblyjs/wasm-parser": "1.7.11",
-        "@webassemblyjs/wast-printer": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz",
-      "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/ieee754": "1.7.11",
-        "@webassemblyjs/leb128": "1.7.11",
-        "@webassemblyjs/utf8": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz",
-      "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-buffer": "1.7.11",
-        "@webassemblyjs/wasm-gen": "1.7.11",
-        "@webassemblyjs/wasm-parser": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz",
-      "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-api-error": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/ieee754": "1.7.11",
-        "@webassemblyjs/leb128": "1.7.11",
-        "@webassemblyjs/utf8": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz",
-      "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/floating-point-hex-parser": "1.7.11",
-        "@webassemblyjs/helper-api-error": "1.7.11",
-        "@webassemblyjs/helper-code-frame": "1.7.11",
-        "@webassemblyjs/helper-fsm": "1.7.11",
-        "@xtuc/long": "4.2.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz",
-      "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/wast-parser": "1.7.11",
-        "@xtuc/long": "4.2.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@wry/context": {
@@ -2261,15 +2323,15 @@
       "dev": true
     },
     "@xtuc/long": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz",
-      "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
     "abab": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
-      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz",
+      "integrity": "sha512-2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==",
       "dev": true
     },
     "abbrev": {
@@ -2287,42 +2349,25 @@
       }
     },
     "acorn": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
       "dev": true
     },
-    "acorn-dynamic-import": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
-      "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.0.0"
-      }
-    },
     "acorn-globals": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz",
-      "integrity": "sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+      "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
       "dev": true,
       "requires": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-          "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
-          "dev": true
-        }
       }
     },
     "acorn-jsx": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
-      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz",
+      "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==",
       "dev": true
     },
     "acorn-walk": {
@@ -2332,9 +2377,9 @@
       "dev": true
     },
     "address": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.1.0.tgz",
-      "integrity": "sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
+      "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==",
       "dev": true
     },
     "ajv": {
@@ -2447,30 +2492,30 @@
       }
     },
     "apollo-cache-control": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.0.tgz",
-      "integrity": "sha512-BBnfUmSWRws5dRSDD+R56RLJCE9v6xQuob+i/1Ju9EX4LZszU5JKVmxEvnkJ1bk/BkihjoQXTnP6fJCnt6fCmA==",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.4.tgz",
+      "integrity": "sha512-IZ1d3AXZtkZhLYo0kWqTbZ6nqLFaeUvLdMESs+9orMadBZ7mvzcAfBwrhKyCWPGeAAZ/jKv8FtYHybpchHgFAg==",
       "requires": {
-        "apollo-server-env": "2.4.0",
-        "graphql-extensions": "0.8.0"
+        "apollo-server-env": "^2.4.3",
+        "graphql-extensions": "^0.10.3"
       }
     },
     "apollo-cache-inmemory": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz",
-      "integrity": "sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz",
+      "integrity": "sha512-S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg==",
       "requires": {
         "apollo-cache": "^1.3.2",
         "apollo-utilities": "^1.3.2",
-        "optimism": "^0.9.0",
+        "optimism": "^0.10.0",
         "ts-invariant": "^0.4.0",
         "tslib": "^1.9.3"
       }
     },
     "apollo-client": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.3.tgz",
-      "integrity": "sha512-DS8pmF5CGiiJ658dG+mDn8pmCMMQIljKJSTeMNHnFuDLV0uAPZoeaAwVFiAmB408Ujqt92oIZ/8yJJAwSIhd4A==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.4.tgz",
+      "integrity": "sha512-oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ==",
       "requires": {
         "@types/zen-observable": "^0.8.0",
         "apollo-cache": "1.3.2",
@@ -2483,25 +2528,26 @@
       }
     },
     "apollo-datasource": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.0.tgz",
-      "integrity": "sha512-DOzzYWEOReYRu2vWPKEulqlTb9Xjg67sjVCzve5MXa7GUXjfr8IKioljvfoBMlqm/PpbJVk2ci4n5NIFqoYsrQ==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.3.tgz",
+      "integrity": "sha512-gRYyFVpJgHE2hhS+VxMeOerxXQ/QYxWG7T6QddfugJWYAG9DRCl65e2b7txcGq2NP3r+O1iCm4GNwhRBDJbd8A==",
       "requires": {
-        "apollo-server-caching": "0.5.0",
-        "apollo-server-env": "2.4.0"
+        "apollo-server-caching": "^0.5.0",
+        "apollo-server-env": "^2.4.3"
       }
     },
     "apollo-engine-reporting": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.0.tgz",
-      "integrity": "sha512-NMiO3h1cuEBt6QZNGHxivwuyZQnoU/2MMx0gUA8Gyy1ERBhK6P235qoMnvoi34rLmqJuyGPX6tXcab8MpMIzYQ==",
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.6.tgz",
+      "integrity": "sha512-acfb7oFnru/8YQdY4x6+7WJbZfzdVETI8Cl+9ImgUrvUnE8P+f2SsGTKXTC1RuUvve4c56PAvaPgE+z8X1a1Mw==",
       "requires": {
-        "apollo-engine-reporting-protobuf": "0.4.0",
+        "apollo-engine-reporting-protobuf": "^0.4.0",
         "apollo-graphql": "^0.3.3",
-        "apollo-server-env": "2.4.0",
-        "apollo-server-types": "0.2.0",
+        "apollo-server-caching": "^0.5.0",
+        "apollo-server-env": "^2.4.3",
+        "apollo-server-types": "^0.2.4",
         "async-retry": "^1.2.1",
-        "graphql-extensions": "0.8.0"
+        "graphql-extensions": "^0.10.3"
       }
     },
     "apollo-engine-reporting-protobuf": {
@@ -2523,9 +2569,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",
-          "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ=="
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
+          "integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="
         },
         "node-fetch": {
           "version": "2.6.0",
@@ -2535,50 +2581,50 @@
       }
     },
     "apollo-graphql": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.3.3.tgz",
-      "integrity": "sha512-t3CO/xIDVsCG2qOvx2MEbuu4b/6LzQjcBBwiVnxclmmFyAxYCIe7rpPlnLHSq7HyOMlCWDMozjoeWfdqYSaLqQ==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.3.4.tgz",
+      "integrity": "sha512-w+Az1qxePH4oQ8jvbhQBl5iEVvqcqynmU++x/M7MM5xqN1C7m1kyIzpN17gybXlTJXY4Oxej2WNURC2/hwpfYw==",
       "requires": {
-        "apollo-env": "0.5.1",
+        "apollo-env": "^0.5.1",
         "lodash.sortby": "^4.7.0"
       }
     },
     "apollo-link": {
-      "version": "1.2.12",
-      "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.12.tgz",
-      "integrity": "sha512-fsgIAXPKThyMVEMWQsUN22AoQI+J/pVXcjRGAShtk97h7D8O+SPskFinCGEkxPeQpE83uKaqafB2IyWdjN+J3Q==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.13.tgz",
+      "integrity": "sha512-+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==",
       "requires": {
         "apollo-utilities": "^1.3.0",
         "ts-invariant": "^0.4.0",
         "tslib": "^1.9.3",
-        "zen-observable-ts": "^0.8.19"
+        "zen-observable-ts": "^0.8.20"
       }
     },
     "apollo-link-context": {
-      "version": "1.0.18",
-      "resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.18.tgz",
-      "integrity": "sha512-aG5cbUp1zqOHHQjAJXG7n/izeMQ6LApd/whEF5z6qZp5ATvcyfSNkCfy3KRJMMZZ3iNfVTs6jF+IUA8Zvf+zeg==",
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.19.tgz",
+      "integrity": "sha512-TUi5TyufU84hEiGkpt+5gdH5HkB3Gx46npNfoxR4of3DKBCMuItGERt36RCaryGcU/C3u2zsICU3tJ+Z9LjFoQ==",
       "requires": {
-        "apollo-link": "^1.2.12",
+        "apollo-link": "^1.2.13",
         "tslib": "^1.9.3"
       }
     },
     "apollo-link-error": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.1.11.tgz",
-      "integrity": "sha512-442DNqn3CNRikDaenMMkoDmCRmkoUx/XyUMlRTZBEFdTw3FYPQLsmDO3hzzC4doY5/BHcn9/jdYh9EeLx4HPsA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.1.12.tgz",
+      "integrity": "sha512-psNmHyuy3valGikt/XHJfe0pKJnRX19tLLs6P6EHRxg+6q6JMXNVLYPaQBkL0FkwdTCB0cbFJAGRYCBviG8TDA==",
       "requires": {
-        "apollo-link": "^1.2.12",
-        "apollo-link-http-common": "^0.2.14",
+        "apollo-link": "^1.2.13",
+        "apollo-link-http-common": "^0.2.15",
         "tslib": "^1.9.3"
       }
     },
     "apollo-link-http-common": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.14.tgz",
-      "integrity": "sha512-v6mRU1oN6XuX8beVIRB6OpF4q1ULhSnmy7ScnHnuo1qV6GaFmDcbdvXqxIkAV1Q8SQCo2lsv4HeqJOWhFfApOg==",
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz",
+      "integrity": "sha512-+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg==",
       "requires": {
-        "apollo-link": "^1.2.12",
+        "apollo-link": "^1.2.13",
         "ts-invariant": "^0.4.0",
         "tslib": "^1.9.3"
       }
@@ -2602,11 +2648,11 @@
       }
     },
     "apollo-link-ws": {
-      "version": "1.0.18",
-      "resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.18.tgz",
-      "integrity": "sha512-nrWh9m7k1FQw1AK1GB1VTJS0o01cpsP2RYmTAh2j+P4lL2/72WgsblhbuF+yA1/jsgVrzg6xa+TNw3UwgGp3+g==",
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.19.tgz",
+      "integrity": "sha512-mRXmeUkc55ixOdYRtfq5rq3o9sboKghKABKroDVhJnkdS56zthBEWMAD+phajujOUbqByxjok0te8ABqByBdeQ==",
       "requires": {
-        "apollo-link": "^1.2.12",
+        "apollo-link": "^1.2.13",
         "tslib": "^1.9.3"
       }
     },
@@ -2629,103 +2675,95 @@
       }
     },
     "apollo-server-core": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.7.0.tgz",
-      "integrity": "sha512-CXjXAkgcMBCJZpsZgfAY5W7f5thdxUhn75UgzeH28RTUZ2aKi/LjoCixPWRSF1lU4vuEWneAnM8Vg/KCD+29lQ==",
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.5.tgz",
+      "integrity": "sha512-SlM/vhjhWb0ayXV3d4gnpq9gh2BsQj+UPfQXfq2X2KG9EH5I1JUH6EtlsctgMCZozirOZmEmUzlqZWSSUOUPgQ==",
       "requires": {
-        "@apollographql/apollo-tools": "^0.3.6",
+        "@apollographql/apollo-tools": "^0.4.0",
         "@apollographql/graphql-playground-html": "1.6.24",
+        "@types/graphql-upload": "^8.0.0",
         "@types/ws": "^6.0.0",
-        "apollo-cache-control": "0.8.0",
-        "apollo-datasource": "0.6.0",
-        "apollo-engine-reporting": "1.4.0",
-        "apollo-engine-reporting-protobuf": "0.4.0",
-        "apollo-server-caching": "0.5.0",
-        "apollo-server-env": "2.4.0",
-        "apollo-server-errors": "2.3.1",
-        "apollo-server-plugin-base": "0.6.0",
-        "apollo-server-types": "0.2.0",
-        "apollo-tracing": "0.8.0",
+        "apollo-cache-control": "^0.8.4",
+        "apollo-datasource": "^0.6.3",
+        "apollo-engine-reporting": "^1.4.6",
+        "apollo-server-caching": "^0.5.0",
+        "apollo-server-env": "^2.4.3",
+        "apollo-server-errors": "^2.3.3",
+        "apollo-server-plugin-base": "^0.6.4",
+        "apollo-server-types": "^0.2.4",
+        "apollo-tracing": "^0.8.4",
         "fast-json-stable-stringify": "^2.0.0",
-        "graphql-extensions": "0.8.0",
-        "graphql-subscriptions": "^1.0.0",
+        "graphql-extensions": "^0.10.3",
         "graphql-tag": "^2.9.2",
         "graphql-tools": "^4.0.0",
         "graphql-upload": "^8.0.2",
         "sha.js": "^2.4.11",
         "subscriptions-transport-ws": "^0.9.11",
         "ws": "^6.0.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
       }
     },
     "apollo-server-env": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.0.tgz",
-      "integrity": "sha512-7ispR68lv92viFeu5zsRUVGP+oxsVI3WeeBNniM22Cx619maBUwcYTIC3+Y3LpXILhLZCzA1FASZwusgSlyN9w==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.3.tgz",
+      "integrity": "sha512-23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA==",
       "requires": {
         "node-fetch": "^2.1.2",
         "util.promisify": "^1.0.0"
       }
     },
     "apollo-server-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.1.tgz",
-      "integrity": "sha512-errZvnh0vUQChecT7M4A/h94dnBSRL213dNxpM5ueMypaLYgnp4hiCTWIEaooo9E4yMGd1qA6WaNbLDG2+bjcg=="
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz",
+      "integrity": "sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g=="
     },
     "apollo-server-express": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.7.0.tgz",
-      "integrity": "sha512-TIOaLyuxD8xIECXjbPfS9HUWgHCKsG3rR4WuTpTreVEB08EsGeg+VcNGn0hmUnch18fPXTciBHWCv/fFV/YhMg==",
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.9.5.tgz",
+      "integrity": "sha512-6gonP7g5u2Kr+9cvKE+NuGPe+As7wRbz2yWoyLOym/TdXBmTRU4AKW2Qs+wpNanurzm2xbTa7sEfzrHGmembrQ==",
       "requires": {
         "@apollographql/graphql-playground-html": "1.6.24",
         "@types/accepts": "^1.3.5",
-        "@types/body-parser": "1.17.0",
+        "@types/body-parser": "1.17.1",
         "@types/cors": "^2.8.4",
-        "@types/express": "4.17.0",
+        "@types/express": "4.17.1",
         "accepts": "^1.3.5",
-        "apollo-server-core": "2.7.0",
-        "apollo-server-types": "0.2.0",
+        "apollo-server-core": "^2.9.5",
+        "apollo-server-types": "^0.2.4",
         "body-parser": "^1.18.3",
         "cors": "^2.8.4",
+        "express": "^4.17.1",
         "graphql-subscriptions": "^1.0.0",
         "graphql-tools": "^4.0.0",
+        "parseurl": "^1.3.2",
+        "subscriptions-transport-ws": "^0.9.16",
         "type-is": "^1.6.16"
       }
     },
     "apollo-server-plugin-base": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.0.tgz",
-      "integrity": "sha512-BjfyWpHyKwHOe819gk3wEFwbnVp9Xvos03lkkYTTcXS/8G7xO78aUcE65mmyAC56/ZQ0aodNFkFrhwNtWBQWUQ==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.4.tgz",
+      "integrity": "sha512-4rY+cBAIpQomGWYBtk8hHkLQWHrh5hgIBPQqmhXh00YFdcY+Ob1/cU2/2iqTcIzhtcaezsc8OZ63au6ahSBQqg==",
       "requires": {
-        "apollo-server-types": "0.2.0"
+        "apollo-server-types": "^0.2.4"
       }
     },
     "apollo-server-types": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.0.tgz",
-      "integrity": "sha512-5dgiyXsM90vnfmdXO1ixHvsLn0d9NP4tWufmr3ZmjKv00r4JAQNUaUdgOSGbRIKoHELQGwxUuTySTZ/tYfGaNQ==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.4.tgz",
+      "integrity": "sha512-G4FvBVgGQcTW6ZBS2+hvcDQkSfdOIKV+cHADduXA275v+5zl42g+bCaGd/hCCKTDRjmQvObLiMxH/BJ6pDMQgA==",
       "requires": {
-        "apollo-engine-reporting-protobuf": "0.4.0",
-        "apollo-server-caching": "0.5.0",
-        "apollo-server-env": "2.4.0"
+        "apollo-engine-reporting-protobuf": "^0.4.0",
+        "apollo-server-caching": "^0.5.0",
+        "apollo-server-env": "^2.4.3"
       }
     },
     "apollo-tracing": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.0.tgz",
-      "integrity": "sha512-cNOtOlyZ56iJRsCjnxjM1V0SnQ2ZZttuyoeOejdat6llPfk5bfYTVOKMjdbSfDvU33LS9g9sqNJCT0MwrEPFKQ==",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.4.tgz",
+      "integrity": "sha512-DjbFW0IvHicSlTVG+vK+1WINfBMRCdPPHJSW/j65JMir9Oe56WGeqL8qz8hptdUUmLYEb+azvcyyGsJsiR3zpQ==",
       "requires": {
-        "apollo-server-env": "2.4.0",
-        "graphql-extensions": "0.8.0"
+        "apollo-server-env": "^2.4.3",
+        "graphql-extensions": "^0.10.3"
       }
     },
     "apollo-upload-client": {
@@ -2800,12 +2838,6 @@
       "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
       "dev": true
     },
-    "array-filter": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
-      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
-      "dev": true
-    },
     "array-find": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
@@ -2827,18 +2859,6 @@
         "es-abstract": "^1.7.0"
       }
     },
-    "array-map": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=",
-      "dev": true
-    },
-    "array-reduce": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
-      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
-      "dev": true
-    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -2943,9 +2963,9 @@
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
     },
     "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
     },
     "async-retry": {
       "version": "1.2.3",
@@ -2967,24 +2987,24 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
     },
     "autoprefixer": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
-      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
+      "version": "9.6.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.4.tgz",
+      "integrity": "sha512-Koz2cJU9dKOxG8P1f8uVaBntOv9lP4yz9ffWvWaicv9gHBPhpQB22nGijwd8gqW9CNT+UdkbQOQNLVI8jN1ZfQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.6.3",
-        "caniuse-lite": "^1.0.30000980",
+        "browserslist": "^4.7.0",
+        "caniuse-lite": "^1.0.30000998",
         "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.17",
-        "postcss-value-parser": "^4.0.0"
+        "postcss": "^7.0.18",
+        "postcss-value-parser": "^4.0.2"
       },
       "dependencies": {
         "postcss-value-parser": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz",
-          "integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==",
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
+          "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
           "dev": true
         }
       }
@@ -3055,29 +3075,17 @@
       "dev": true
     },
     "babel-eslint": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.2.tgz",
-      "integrity": "sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz",
+      "integrity": "sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "@babel/parser": "^7.0.0",
         "@babel/traverse": "^7.0.0",
         "@babel/types": "^7.0.0",
-        "eslint-scope": "3.7.1",
-        "eslint-visitor-keys": "^1.0.0"
-      },
-      "dependencies": {
-        "eslint-scope": {
-          "version": "3.7.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
-          "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        }
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
       }
     },
     "babel-extract-comments": {
@@ -4045,9 +4053,9 @@
       }
     },
     "base64-js": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
       "dev": true
     },
     "batch": {
@@ -4078,9 +4086,9 @@
       },
       "dependencies": {
         "bluebird": {
-          "version": "3.5.5",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
+          "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==",
           "dev": true
         }
       }
@@ -4330,14 +4338,14 @@
       }
     },
     "browserslist": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
-      "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz",
+      "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000984",
-        "electron-to-chromium": "^1.3.191",
-        "node-releases": "^1.1.25"
+        "caniuse-lite": "^1.0.30000989",
+        "electron-to-chromium": "^1.3.247",
+        "node-releases": "^1.1.29"
       }
     },
     "bser": {
@@ -4403,9 +4411,9 @@
       "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
     },
     "cacache": {
-      "version": "11.3.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
-      "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+      "version": "12.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
+      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.5",
@@ -4413,6 +4421,7 @@
         "figgy-pudding": "^3.5.1",
         "glob": "^7.1.4",
         "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
         "lru-cache": "^5.1.1",
         "mississippi": "^3.0.0",
         "mkdirp": "^0.5.1",
@@ -4425,9 +4434,9 @@
       },
       "dependencies": {
         "bluebird": {
-          "version": "3.5.5",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
+          "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==",
           "dev": true
         },
         "lru-cache": {
@@ -4468,19 +4477,6 @@
         "neo-async": "^2.6.0",
         "normalize-path": "^3.0.0",
         "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
       }
     },
     "cachedir": {
@@ -4561,9 +4557,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000984",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz",
-      "integrity": "sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==",
+      "version": "1.0.30000999",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz",
+      "integrity": "sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==",
       "dev": true
     },
     "capture-exit": {
@@ -4628,9 +4624,9 @@
       "dev": true
     },
     "chokidar": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
-      "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "requires": {
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
@@ -4647,9 +4643,9 @@
       }
     },
     "chownr": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
-      "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
+      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
       "dev": true
     },
     "chrome-trace-event": {
@@ -4783,9 +4779,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -4965,26 +4961,16 @@
       "dev": true
     },
     "clone-deep": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
-      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
         "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       },
       "dependencies": {
-        "for-own": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-          "dev": true,
-          "requires": {
-            "for-in": "^1.0.1"
-          }
-        },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
@@ -5059,9 +5045,9 @@
       }
     },
     "colors": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-      "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true,
       "optional": true
     },
@@ -5075,9 +5061,9 @@
       }
     },
     "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.1.tgz",
+      "integrity": "sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==",
       "dev": true
     },
     "common-tags": {
@@ -5186,9 +5172,9 @@
       }
     },
     "confusing-browser-globals": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.7.tgz",
-      "integrity": "sha512-cgHI1azax5ATrZ8rJ+ODDML9Fvu67PimB6aNxBrc/QwSaDaM9eTfIEUHx3bBLJJ82ioSb+/5zfsMCCEJax3ByQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
+      "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==",
       "dev": true
     },
     "connect-history-api-fallback": {
@@ -5310,9 +5296,9 @@
       },
       "dependencies": {
         "bluebird": {
-          "version": "3.5.5",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
+          "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==",
           "dev": true
         },
         "cacache": {
@@ -5427,33 +5413,25 @@
       "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
     },
     "core-js-compat": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz",
-      "integrity": "sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz",
+      "integrity": "sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==",
       "dev": true,
       "optional": true,
       "requires": {
-        "browserslist": "^4.6.2",
-        "core-js-pure": "3.1.4",
-        "semver": "^6.1.1"
+        "browserslist": "^4.6.6",
+        "semver": "^6.3.0"
       },
       "dependencies": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true,
           "optional": true
         }
       }
     },
-    "core-js-pure": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz",
-      "integrity": "sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==",
-      "dev": true,
-      "optional": true
-    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -5556,11 +5534,13 @@
       }
     },
     "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "requires": {
-        "lru-cache": "^4.0.1",
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
       }
@@ -5872,15 +5852,15 @@
       "dev": true
     },
     "cyclist": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
       "dev": true
     },
     "cypress": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.4.0.tgz",
-      "integrity": "sha512-vUE+sK3l23fhs5qTN3dKpveyP0fGr37VmK3FSYaTEjbqC/qh4DbA1Ych/3bLStUpHP4rpE5KAx7i1s/tpdD9vQ==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.4.1.tgz",
+      "integrity": "sha512-1HBS7t9XXzkt6QHbwfirWYty8vzxNMawGj1yI+Fu6C3/VZJ8UtUngMW6layqwYZzLTZV8tiDpdCNBypn78V4Dg==",
       "dev": true,
       "requires": {
         "@cypress/listr-verbose-renderer": "0.4.1",
@@ -5898,12 +5878,11 @@
         "extract-zip": "1.6.7",
         "fs-extra": "5.0.0",
         "getos": "3.1.1",
-        "glob": "7.1.3",
         "is-ci": "1.2.1",
         "is-installed-globally": "0.1.0",
         "lazy-ass": "1.6.0",
         "listr": "0.12.0",
-        "lodash": "4.17.11",
+        "lodash": "4.17.15",
         "log-symbols": "2.2.0",
         "minimist": "1.2.0",
         "moment": "2.24.0",
@@ -5922,19 +5901,6 @@
           "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
           "dev": true
         },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -5959,26 +5925,6 @@
             "strip-eof": "^1.0.0"
           }
         },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -6064,10 +6010,18 @@
       "dev": true
     },
     "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
+      "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==",
+      "dev": true,
+      "requires": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      }
     },
     "deep-extend": {
       "version": "0.6.0",
@@ -6086,13 +6040,88 @@
       "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
     },
     "default-gateway": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.2.tgz",
-      "integrity": "sha512-wXuT0q8T5vxQNecrTgz/KbU2lPUMRc98I9Y5dnH3yhFB3BGYqtADK4lhivLlG0OfjhmfKx1PGILG2jR4zjI+WA==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.3.tgz",
+      "integrity": "sha512-zW+ld9xtN0+q48wIwhitUzhfERJN7BPgvijPhuCKG6bfWqnoqtSNSnrXfvAME2ZJLpgYpz6UorpBddGfLzrJBw==",
       "dev": true,
       "requires": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
+        "execa": "^2.0.3"
+      },
+      "dependencies": {
+        "execa": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-2.0.5.tgz",
+          "integrity": "sha512-SwmwZZyJjflcqLSgllk4EQlMLst2p9muyzwNugKGFlpAz6rZ7M+s2nBR97GAq4Vzjwx2y9rcMcmqzojwN+xwNA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.5",
+            "get-stream": "^5.0.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^3.0.0",
+            "onetime": "^5.1.0",
+            "p-finally": "^2.0.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "dev": true
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        },
+        "npm-run-path": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz",
+          "integrity": "sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "onetime": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+          "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "p-finally": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
+          "dev": true
+        },
+        "path-key": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz",
+          "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==",
+          "dev": true
+        }
       }
     },
     "default-require-extensions": {
@@ -6349,13 +6378,21 @@
       "dev": true
     },
     "dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
       "dev": true,
       "requires": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "dev": true
+        }
       }
     },
     "domain-browser": {
@@ -6399,9 +6436,9 @@
       }
     },
     "dot-object": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/dot-object/-/dot-object-1.8.1.tgz",
-      "integrity": "sha512-Tk/EzgutsRgX1agdapqO8GTLMVFC2wg2X3xJB76W+rEIlTplQksedM/MzYS+FmkE8llJ6nMR60mhhw9aaGGHGA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/dot-object/-/dot-object-1.9.0.tgz",
+      "integrity": "sha512-7MPN6y7XhAO4vM4eguj5+5HNKLjJYfkVG1ZR1Aput4Q4TR6SYeSjhpVQ77IzJHoSHffKbDxBC+48aCiiRurDPw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -6485,15 +6522,15 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "ejs": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz",
-      "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz",
+      "integrity": "sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==",
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.194",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.194.tgz",
-      "integrity": "sha512-w0LHR2YD9Ex1o+Sz4IN2hYzCB8vaFtMNW+yJcBf6SZlVqgFahkne/4rGVJdk4fPF98Gch9snY7PiabOh+vqHNg==",
+      "version": "1.3.277",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.277.tgz",
+      "integrity": "sha512-Czmsrgng89DOgJlIknnw9bn5431QdtnUwGp5YYiPwU1DbZQUxCLF+rc1ZC09VNAdalOPcvH6AE8BaA0H5HjI/w==",
       "dev": true
     },
     "elegant-spinner": {
@@ -6503,9 +6540,9 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
-      "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+      "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
       "dev": true,
       "requires": {
         "bn.js": "^4.4.0",
@@ -6534,9 +6571,9 @@
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
     "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "requires": {
         "once": "^1.4.0"
       }
@@ -6553,9 +6590,9 @@
       }
     },
     "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
       "dev": true
     },
     "errno": {
@@ -6577,25 +6614,29 @@
       }
     },
     "error-stack-parser": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.2.tgz",
-      "integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.4.tgz",
+      "integrity": "sha512-fZ0KkoxSjLFmhW5lHbUT3tLwy3nX1qEzMYo8koY1vrsAco53CMT1djnBSeC/wUjTEZRhZl9iRw7PaMaxfJ4wzQ==",
       "dev": true,
       "requires": {
-        "stackframe": "^1.0.4"
+        "stackframe": "^1.1.0"
       }
     },
     "es-abstract": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
-      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz",
+      "integrity": "sha512-bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==",
       "requires": {
         "es-to-primitive": "^1.2.0",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-symbols": "^1.0.0",
         "is-callable": "^1.1.4",
         "is-regex": "^1.0.4",
-        "object-keys": "^1.0.12"
+        "object-inspect": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "string.prototype.trimleft": "^2.1.0",
+        "string.prototype.trimright": "^2.1.0"
       }
     },
     "es-to-primitive": {
@@ -6619,9 +6660,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
-      "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
+      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
       "dev": true,
       "requires": {
         "esprima": "^3.1.3",
@@ -6683,12 +6724,6 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-          "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
-          "dev": true
-        },
         "ansi-escapes": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
@@ -6707,19 +6742,6 @@
           "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
           "dev": true
         },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -6806,9 +6828,9 @@
           }
         },
         "inquirer": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz",
-          "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==",
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+          "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
           "dev": true,
           "requires": {
             "ansi-escapes": "^3.2.0",
@@ -6855,10 +6877,19 @@
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "rxjs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
-          "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+          "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -6876,9 +6907,9 @@
           }
         },
         "table": {
-          "version": "5.4.4",
-          "resolved": "https://registry.npmjs.org/table/-/table-5.4.4.tgz",
-          "integrity": "sha512-IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg==",
+          "version": "5.4.6",
+          "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+          "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
           "dev": true,
           "requires": {
             "ajv": "^6.10.2",
@@ -7012,9 +7043,9 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz",
-      "integrity": "sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
+      "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
       "dev": true,
       "requires": {
         "debug": "^2.6.8",
@@ -7033,9 +7064,9 @@
       }
     },
     "eslint-plugin-cypress": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.6.0.tgz",
-      "integrity": "sha512-/YmvhYFqjFLYw7llDl56U9KW+Z25TZJjDofT47aUnAFRRvOhj1y2nxJzZ1ZTnqBO1ja8gwRhtdT7LfTLg9ANJw==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.7.0.tgz",
+      "integrity": "sha512-52Lq5ePCD/8jc536e1RqtLfj33BAy1s7BlYgCjbG39J5kqUitcTlRY5i3NRoeAyPHueDwETsq0eASF44ugLosQ==",
       "dev": true,
       "requires": {
         "globals": "^11.12.0"
@@ -7052,9 +7083,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.1.tgz",
-      "integrity": "sha512-YEESFKOcMIXJTosb5YaepqVhQHGMb8dxkgov560GqMDP/658U5vk6FeVSR7xXLeYkPc7xPYy+uAoiYE/bKMphA==",
+      "version": "2.18.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
+      "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
       "dev": true,
       "requires": {
         "array-includes": "^3.0.3",
@@ -7139,12 +7170,6 @@
         "vue-eslint-parser": "^5.0.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-          "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
-          "dev": true
-        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -7198,18 +7223,18 @@
       }
     },
     "eslint-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz",
-      "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
+      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.0.0"
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
       "dev": true
     },
     "esm": {
@@ -7273,15 +7298,15 @@
       }
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
     "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "etag": {
       "version": "1.8.1",
@@ -7347,18 +7372,6 @@
         "strip-eof": "^1.0.0"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
         "get-stream": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -7366,15 +7379,6 @@
           "requires": {
             "pump": "^3.0.0"
           }
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
         }
       }
     },
@@ -7759,19 +7763,6 @@
       "requires": {
         "loader-utils": "^1.0.2",
         "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
       }
     },
     "filename-regex": {
@@ -7876,9 +7867,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
           "requires": {
             "p-try": "^2.0.0"
           }
@@ -7936,9 +7927,9 @@
       },
       "dependencies": {
         "is-buffer": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
           "dev": true
         }
       }
@@ -7954,6 +7945,18 @@
         "graceful-fs": "^4.1.2",
         "rimraf": "~2.6.2",
         "write": "^0.2.1"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "flatted": {
@@ -7979,12 +7982,12 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
-      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
+      "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.6"
+        "debug": "^3.0.0"
       },
       "dependencies": {
         "debug": {
@@ -8607,9 +8610,9 @@
       "dev": true
     },
     "get-own-enumerable-property-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz",
-      "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.1.tgz",
+      "integrity": "sha512-09/VS4iek66Dh2bctjRkowueRJbY1JDGR1L/zRxO1Qk8Uxs6PnqaNSqalpizPT+CDjre3hnEsuzvhgomz9qYrA==",
       "dev": true
     },
     "get-stream": {
@@ -8777,14 +8780,14 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
-      "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
     },
     "graphql": {
-      "version": "14.4.2",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.4.2.tgz",
-      "integrity": "sha512-6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ==",
+      "version": "14.5.8",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.5.8.tgz",
+      "integrity": "sha512-MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg==",
       "requires": {
         "iterall": "^1.2.2"
       }
@@ -8823,13 +8826,13 @@
       }
     },
     "graphql-extensions": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.8.0.tgz",
-      "integrity": "sha512-zV9RefkusIXqi9ZJtl7IJ5ecjDKdb7PLAb5E3CmxX3OK1GwNCIubp0vE7Fp4fXlCUKgTB1Woubs0zj71JT8o0A==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.10.3.tgz",
+      "integrity": "sha512-kwU0gUe+Qdfr8iZYT91qrPSwQNgPhB/ClF1m1LEPdxlptk5FhFmjpxAcbMZ8q7j0kjfnbp2IeV1OhRDCEPqz2w==",
       "requires": {
-        "@apollographql/apollo-tools": "^0.3.6",
-        "apollo-server-env": "2.4.0",
-        "apollo-server-types": "0.2.0"
+        "@apollographql/apollo-tools": "^0.4.0",
+        "apollo-server-env": "^2.4.3",
+        "apollo-server-types": "^0.2.4"
       }
     },
     "graphql-import": {
@@ -8932,9 +8935,9 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
-      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.2.tgz",
+      "integrity": "sha512-cIv17+GhL8pHHnRJzGu2wwcthL5sb8uDKBHvZ2Dtu5s1YNt0ljbzKbamnc+gr69y7bzwQiBdr5+hOpRd5pnOdg==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.0",
@@ -9052,9 +9055,9 @@
       "dev": true
     },
     "highlight.js": {
-      "version": "9.15.8",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.8.tgz",
-      "integrity": "sha512-RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA==",
+      "version": "9.15.10",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz",
+      "integrity": "sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==",
       "dev": true
     },
     "hmac-drbg": {
@@ -9091,9 +9094,9 @@
       "dev": true
     },
     "hosted-git-info": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
       "dev": true
     },
     "hpack.js": {
@@ -9243,6 +9246,12 @@
         "readable-stream": "^3.1.1"
       },
       "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
+        },
         "readable-stream": {
           "version": "3.4.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
@@ -9281,14 +9290,22 @@
       "dev": true
     },
     "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
+      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
       "dev": true,
       "requires": {
-        "eventemitter3": "^3.0.0",
+        "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
         "requires-port": "^1.0.0"
+      },
+      "dependencies": {
+        "eventemitter3": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
+          "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+          "dev": true
+        }
       }
     },
     "http-proxy-middleware": {
@@ -9478,6 +9495,12 @@
       "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
       "dev": true
     },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -9577,9 +9600,9 @@
       }
     },
     "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
       "dev": true
     },
     "ip": {
@@ -9613,6 +9636,12 @@
         "kind-of": "^3.0.2"
       }
     },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "dev": true
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -9884,9 +9913,9 @@
       "dev": true
     },
     "is-retry-allowed": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
     },
     "is-stream": {
       "version": "1.1.0",
@@ -11136,9 +11165,9 @@
       }
     },
     "js-beautify": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.1.tgz",
-      "integrity": "sha512-4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz",
+      "integrity": "sha512-ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==",
       "dev": true,
       "requires": {
         "config-chain": "^1.1.12",
@@ -11222,6 +11251,23 @@
         "whatwg-url": "^6.4.1",
         "ws": "^5.2.0",
         "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+          "dev": true
+        },
+        "ws": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
       }
     },
     "jsesc": {
@@ -11281,9 +11327,9 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
+      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.0"
@@ -11370,12 +11416,12 @@
       "dev": true
     },
     "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
       "dev": true,
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "^2.0.0"
       }
     },
     "left-pad": {
@@ -11627,9 +11673,9 @@
           "dev": true
         },
         "rxjs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
-          "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+          "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -12059,12 +12105,6 @@
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
-    "lodash.tail": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
-      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
-      "dev": true
-    },
     "lodash.template": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
@@ -12143,9 +12183,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
-      "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==",
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz",
+      "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==",
       "dev": true
     },
     "long": {
@@ -12217,6 +12257,12 @@
         "tmpl": "1.0.x"
       }
     },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -12288,12 +12334,22 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        }
       }
     },
     "memory-fs": {
@@ -12336,9 +12392,9 @@
       }
     },
     "merge2": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz",
-      "integrity": "sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
+      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
       "dev": true
     },
     "methods": {
@@ -12447,17 +12503,6 @@
             "query-string": "^5.0.1",
             "sort-keys": "^2.0.0"
           }
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
         }
       }
     },
@@ -12512,31 +12557,13 @@
         "is-extendable": "^1.0.1"
       },
       "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
-      "dev": true,
-      "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-in": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
-          "dev": true
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
         }
       }
     },
@@ -12798,13 +12825,13 @@
       }
     },
     "node-cache": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz",
-      "integrity": "sha512-obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-4.2.1.tgz",
+      "integrity": "sha512-BOb67bWg2dTyax5kdef5WfU3X8xu4wPg+zHzkvls0Q/QpYycIFRLEEIdAx9Wma43DxG6Qzn4illdZoYseKWa4A==",
       "dev": true,
       "requires": {
         "clone": "2.x",
-        "lodash": "4.x"
+        "lodash": "^4.17.15"
       },
       "dependencies": {
         "clone": {
@@ -12821,9 +12848,9 @@
       "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U="
     },
     "node-forge": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
-      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
+      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
       "dev": true
     },
     "node-int64": {
@@ -12883,9 +12910,9 @@
       }
     },
     "node-notifier": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.0.tgz",
-      "integrity": "sha512-SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
+      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
       "dev": true,
       "requires": {
         "growly": "^1.3.0",
@@ -12896,18 +12923,26 @@
       }
     },
     "node-releases": {
-      "version": "1.1.25",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz",
-      "integrity": "sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==",
+      "version": "1.1.34",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.34.tgz",
+      "integrity": "sha512-fNn12JTEfniTuCqo0r9jXgl44+KxRH/huV7zM/KAGOKxDKrHr6EbT7SSs4B+DNxyBE2mks28AD+Jw6PkfY5uwA==",
       "dev": true,
       "requires": {
-        "semver": "^5.3.0"
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "nodemon": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz",
-      "integrity": "sha512-/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg==",
+      "version": "1.19.3",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.3.tgz",
+      "integrity": "sha512-TBNKRmJykEbxpTniZBusqRrUTHIEqa2fpecbTQDQj1Gxjth7kKAPP296ztR0o5gPUWsiYbuEbt73/+XMYab1+w==",
       "requires": {
         "chokidar": "^2.1.5",
         "debug": "^3.1.0",
@@ -13067,6 +13102,17 @@
       "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
       "dev": true
     },
+    "object-inspect": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+    },
+    "object-is": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
+      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+      "dev": true
+    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -13210,9 +13256,9 @@
       }
     },
     "optimism": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.9.6.tgz",
-      "integrity": "sha512-bWr/ZP32UgFCQAoSkz33XctHwpq2via2sBvGvO5JIlrU8gaiM0LvoKj3QMle9LWdSKlzKik8XGSerzsdfYLNxA==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.10.3.tgz",
+      "integrity": "sha512-9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw==",
       "requires": {
         "@wry/context": "^0.4.0"
       }
@@ -13308,31 +13354,14 @@
       "dev": true
     },
     "os-locale": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
       "dev": true,
       "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        }
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
       }
     },
     "os-tmpdir": {
@@ -13425,12 +13454,12 @@
       "dev": true
     },
     "parallel-transform": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
       "dev": true,
       "requires": {
-        "cyclist": "~0.2.2",
+        "cyclist": "^1.0.1",
         "inherits": "^2.0.3",
         "readable-stream": "^2.1.5"
       }
@@ -13462,9 +13491,9 @@
       }
     },
     "parse-asn1": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
-      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
       "dev": true,
       "requires": {
         "asn1.js": "^4.0.0",
@@ -13668,9 +13697,9 @@
       }
     },
     "please-upgrade-node": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz",
-      "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
       "dev": true,
       "requires": {
         "semver-compare": "^1.0.0"
@@ -13690,9 +13719,9 @@
       "dev": true
     },
     "portfinder": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.21.tgz",
-      "integrity": "sha512-ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA==",
+      "version": "1.0.24",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz",
+      "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
       "dev": true,
       "requires": {
         "async": "^1.5.2",
@@ -13714,9 +13743,9 @@
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "postcss": {
-      "version": "7.0.17",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
-      "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
+      "version": "7.0.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz",
+      "integrity": "sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -13826,19 +13855,6 @@
         "postcss": "^7.0.0",
         "postcss-load-config": "^2.0.0",
         "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
       }
     },
     "postcss-merge-longhand": {
@@ -14352,9 +14368,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "10.14.13",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.13.tgz",
-          "integrity": "sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ=="
+          "version": "10.14.20",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.20.tgz",
+          "integrity": "sha512-An+MXSV8CGXz/BO9C1KKsoJ/8WDrvlNUaRMsm2h+IHZuSyQkM8U5bJJkb8ItLKA73VePG/nUK+t+EuW2IWuhsQ=="
         }
       }
     },
@@ -14379,9 +14395,9 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
-      "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
       "dev": true
     },
     "pstree.remy": {
@@ -14407,7 +14423,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -14748,11 +14763,14 @@
         }
       }
     },
-    "regexp-tree": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz",
-      "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==",
-      "dev": true
+    "regexp.prototype.flags": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
+      "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2"
+      }
     },
     "regexpp": {
       "version": "1.1.0",
@@ -14762,13 +14780,13 @@
       "optional": true
     },
     "regexpu-core": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
-      "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
+      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.0.2",
+        "regenerate-unicode-properties": "^8.1.0",
         "regjsgen": "^0.5.0",
         "regjsparser": "^0.6.0",
         "unicode-match-property-ecmascript": "^1.0.4",
@@ -15004,9 +15022,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
-      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -15074,9 +15092,9 @@
       "dev": true
     },
     "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
@@ -15186,32 +15204,37 @@
       }
     },
     "sass": {
-      "version": "1.22.7",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.7.tgz",
-      "integrity": "sha512-ahREi0AdG7RTovSv14+yd1prQSfIvFcrDpOsth5EQf1+RM7SvOxsSttzNQaFmK1aa/k/3vyYwlYF5l0Xl+6c+g==",
+      "version": "1.23.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.23.0.tgz",
+      "integrity": "sha512-W4HT8+WE31Rzk3EPQC++CXjD5O+lOxgYBIB8Ohvt7/zeE2UzYW+TOczDrRU3KcEy3+xwXXbmDsOZFkoqgD4TKw==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
       }
     },
     "sass-loader": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
-      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
+      "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
       "dev": true,
       "requires": {
-        "clone-deep": "^2.0.1",
+        "clone-deep": "^4.0.1",
         "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
         "neo-async": "^2.5.0",
-        "pify": "^3.0.0",
-        "semver": "^5.5.0"
+        "pify": "^4.0.1",
+        "semver": "^6.3.0"
       },
       "dependencies": {
         "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
@@ -15223,12 +15246,13 @@
       "dev": true
     },
     "schema-utils": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-      "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
       "requires": {
         "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
         "ajv-keywords": "^3.1.0"
       }
     },
@@ -15245,18 +15269,18 @@
       "dev": true
     },
     "selfsigned": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
-      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
+      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
       "dev": true,
       "requires": {
-        "node-forge": "0.7.5"
+        "node-forge": "0.9.0"
       }
     },
     "semver": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
     "semver-compare": {
       "version": "1.0.0",
@@ -15305,9 +15329,10 @@
       }
     },
     "serialize-javascript": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
-      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA=="
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+      "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
+      "dev": true
     },
     "serve-index": {
       "version": "1.9.1",
@@ -15399,20 +15424,18 @@
       }
     },
     "shallow-clone": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
-      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
+        "kind-of": "^6.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         }
       }
@@ -15431,16 +15454,10 @@
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
     },
     "shell-quote": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
-      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-      "dev": true,
-      "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
-      }
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "dev": true
     },
     "shellwords": {
       "version": "0.1.1",
@@ -15465,9 +15482,9 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simple-git": {
-      "version": "1.122.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.122.0.tgz",
-      "integrity": "sha512-plTwhnkIHrw2TFMJbJH/mKwWGgFbj03V9wcfBKa4FsuvgJbpwdlSJnlvkIQWDV1CVLaf2Gl6zSNeRRnxBRhX1g==",
+      "version": "1.126.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.126.0.tgz",
+      "integrity": "sha512-47mqHxgZnN8XRa9HbpWprzUv3Ooqz9RY/LSZgvA7jCkW8jcwLahMz7LKugY91KZehfG0sCVPtgXiU72hd6b1Bw==",
       "dev": true,
       "requires": {
         "debug": "^4.0.1"
@@ -15625,9 +15642,9 @@
       }
     },
     "sockjs-client": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
       "dev": true,
       "requires": {
         "debug": "^3.2.5",
@@ -15697,9 +15714,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -15743,9 +15760,9 @@
       "dev": true
     },
     "spdy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
-      "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
+      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
@@ -15886,9 +15903,9 @@
       "dev": true
     },
     "stackframe": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
-      "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.0.tgz",
+      "integrity": "sha512-Vx6W1Yvy+AM1R/ckVwcHQHV147pTPBKWCRLrXMuPrFVfvBUc3os7PR1QLIWCMhPpRg5eX9ojzbQIMLGBwyLjqg==",
       "dev": true
     },
     "staged-git-files": {
@@ -16030,21 +16047,31 @@
         "function-bind": "^1.0.2"
       }
     },
+    "string.prototype.trimleft": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
     "string_decoder": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-      "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
+        "safe-buffer": "~5.2.0"
       }
     },
     "stringify-object": {
@@ -16097,6 +16124,12 @@
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
     },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
+    },
     "strip-indent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
@@ -16142,6 +16175,16 @@
         "iterall": "^1.2.1",
         "symbol-observable": "^1.0.4",
         "ws": "^5.2.0"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
       }
     },
     "supports-color": {
@@ -16191,9 +16234,9 @@
       "dev": true
     },
     "synchronous-promise": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.9.tgz",
-      "integrity": "sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.10.tgz",
+      "integrity": "sha512-6PC+JRGmNjiG3kJ56ZMNWDPL8hjyghF5cMXIFOKg+NiwwEZZIvxTWd0pinWKyD227odg9ygF8xVhhz7gb8Uq7A==",
       "dev": true
     },
     "table": {
@@ -16271,6 +16314,16 @@
         "execa": "^0.7.0"
       },
       "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
         "execa": {
           "version": "0.7.0",
           "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
@@ -16288,9 +16341,9 @@
       }
     },
     "terser": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz",
-      "integrity": "sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==",
+      "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.8.tgz",
+      "integrity": "sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -16299,34 +16352,20 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
-      "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
+      "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
       "dev": true,
       "requires": {
-        "cacache": "^11.3.2",
-        "find-cache-dir": "^2.0.0",
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
         "is-wsl": "^1.1.0",
-        "loader-utils": "^1.2.3",
         "schema-utils": "^1.0.0",
         "serialize-javascript": "^1.7.0",
         "source-map": "^0.6.1",
-        "terser": "^4.0.0",
-        "webpack-sources": "^1.3.0",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
         "worker-farm": "^1.7.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
       }
     },
     "test-exclude": {
@@ -16452,9 +16491,9 @@
       }
     },
     "thread-loader": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.2.tgz",
-      "integrity": "sha512-7xpuc9Ifg6WU+QYw/8uUqNdRwMD+N5gjwHKMqETrs96Qn+7BHwECpt2Brzr4HFlf4IAkZsayNhmGdbkBsTJ//w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz",
+      "integrity": "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==",
       "dev": true,
       "requires": {
         "loader-runner": "^2.3.1",
@@ -16507,9 +16546,9 @@
       "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
     },
     "timers-browserify": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
       "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
@@ -16926,9 +16965,9 @@
       "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
     },
     "upath": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
     },
     "update-notifier": {
       "version": "2.5.0",
@@ -16994,19 +17033,6 @@
         "loader-utils": "^1.1.0",
         "mime": "^2.0.3",
         "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
       }
     },
     "url-parse": {
@@ -17082,9 +17108,9 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -17130,13 +17156,20 @@
       "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
     "vue-apollo": {
-      "version": "3.0.0-rc.2",
-      "resolved": "https://registry.npmjs.org/vue-apollo/-/vue-apollo-3.0.0-rc.2.tgz",
-      "integrity": "sha512-bYgC3sK77rBlLEHi4XFFAm9NTTB10/onAUzUIhioKM8BKnnFOagjykqBtA9xFRVmFvOcgZBNNbgJhzScBeTn4Q==",
+      "version": "3.0.0-rc.7",
+      "resolved": "https://registry.npmjs.org/vue-apollo/-/vue-apollo-3.0.0-rc.7.tgz",
+      "integrity": "sha512-YbE4cVKuIOowhOVhMOLrvReELXZc1l7bKGNKQXYv3H1xRMYaz5U0KhXjgO16UCnYvygAG1jRKbkgSoHwaXmlDA==",
       "requires": {
         "chalk": "^2.4.2",
-        "serialize-javascript": "^1.7.0",
+        "serialize-javascript": "^2.1.0",
         "throttle-debounce": "^2.1.0"
+      },
+      "dependencies": {
+        "serialize-javascript": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.0.tgz",
+          "integrity": "sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ=="
+        }
       }
     },
     "vue-cli-plugin-apollo": {
@@ -17261,15 +17294,15 @@
       }
     },
     "vue-hot-reload-api": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz",
-      "integrity": "sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
       "dev": true
     },
     "vue-i18n": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.12.0.tgz",
-      "integrity": "sha512-Wh40dvkYZH0CntkhQQEed7nY8P/8xOOHy5Bl9W/WmmmW0oLYIL66XWwOqlcnNbLaL5HGN7XISydYVqXS0Sst9w=="
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.14.1.tgz",
+      "integrity": "sha512-uHzw5GTFyf/TmjJXveSl3L4CG61KI4lvhKOQvx8W4Y8P2LZ3v3l/qw4KRs1C6pWyjkfY9p0rezYNFO5YzMEQ8A=="
     },
     "vue-i18n-extract": {
       "version": "0.4.14",
@@ -17328,9 +17361,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -17419,9 +17452,9 @@
       }
     },
     "vue-jest": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-3.0.4.tgz",
-      "integrity": "sha512-PY9Rwt4OyaVlA+KDJJ0614CbEvNOkffDI9g9moLQC/2DDoo0YrqZm7dHi13Q10uoK5Nt5WCYFdeAheOExPah0w==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-3.0.5.tgz",
+      "integrity": "sha512-xWDxde91pDqYBGDlODENZ3ezPgw+IQFoVDtf+5Awlg466w3KvMSqWzs8PxcTeTr+wmAHi0j+a+Lm3R7aUJa1jA==",
       "dev": true,
       "requires": {
         "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
@@ -17455,25 +17488,6 @@
         "loader-utils": "^1.1.0",
         "vue-hot-reload-api": "^2.3.0",
         "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "@vue/component-compiler-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz",
-          "integrity": "sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw==",
-          "dev": true,
-          "requires": {
-            "consolidate": "^0.15.1",
-            "hash-sum": "^1.0.2",
-            "lru-cache": "^4.1.2",
-            "merge-source-map": "^1.1.0",
-            "postcss": "^7.0.14",
-            "postcss-selector-parser": "^5.0.0",
-            "prettier": "1.16.3",
-            "source-map": "~0.6.1",
-            "vue-template-es2015-compiler": "^1.9.0"
-          }
-        }
       }
     },
     "vue-perfect-scrollbar": {
@@ -17498,9 +17512,9 @@
       }
     },
     "vue-router": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.7.tgz",
-      "integrity": "sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz",
+      "integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ=="
     },
     "vue-style-loader": {
       "version": "4.1.2",
@@ -17611,41 +17625,40 @@
       "dev": true
     },
     "webpack": {
-      "version": "4.28.4",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.28.4.tgz",
-      "integrity": "sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-module-context": "1.7.11",
-        "@webassemblyjs/wasm-edit": "1.7.11",
-        "@webassemblyjs/wasm-parser": "1.7.11",
-        "acorn": "^5.6.2",
-        "acorn-dynamic-import": "^3.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.0.tgz",
+      "integrity": "sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.2.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
+        "eslint-scope": "^4.0.3",
         "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^0.4.4",
-        "tapable": "^1.1.0",
-        "terser-webpack-plugin": "^1.1.0",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.1",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz",
-      "integrity": "sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz",
+      "integrity": "sha512-g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A==",
       "dev": true,
       "requires": {
         "acorn": "^6.0.7",
@@ -17657,27 +17670,10 @@
         "express": "^4.16.3",
         "filesize": "^3.6.1",
         "gzip-size": "^5.0.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.15",
         "mkdirp": "^0.5.1",
         "opener": "^1.5.1",
         "ws": "^6.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-          "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
-          "dev": true
-        },
-        "ws": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-          "dev": true,
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
       }
     },
     "webpack-chain": {
@@ -17699,53 +17695,56 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
-      "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
+      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
       "dev": true,
       "requires": {
         "memory-fs": "^0.4.1",
-        "mime": "^2.4.2",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
         "range-parser": "^1.2.1",
         "webpack-log": "^2.0.0"
       }
     },
     "webpack-dev-server": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz",
-      "integrity": "sha512-mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz",
+      "integrity": "sha512-0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
         "bonjour": "^3.5.0",
-        "chokidar": "^2.1.6",
+        "chokidar": "^2.1.8",
         "compression": "^1.7.4",
         "connect-history-api-fallback": "^1.6.0",
         "debug": "^4.1.1",
         "del": "^4.1.1",
         "express": "^4.17.1",
         "html-entities": "^1.2.1",
-        "http-proxy-middleware": "^0.19.1",
+        "http-proxy-middleware": "0.19.1",
         "import-local": "^2.0.0",
         "internal-ip": "^4.3.0",
         "ip": "^1.1.5",
+        "is-absolute-url": "^3.0.3",
         "killable": "^1.0.1",
-        "loglevel": "^1.6.3",
+        "loglevel": "^1.6.4",
         "opn": "^5.5.0",
         "p-retry": "^3.0.1",
-        "portfinder": "^1.0.20",
+        "portfinder": "^1.0.24",
         "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.4",
-        "semver": "^6.1.1",
+        "selfsigned": "^1.10.7",
+        "semver": "^6.3.0",
         "serve-index": "^1.9.1",
         "sockjs": "0.3.19",
-        "sockjs-client": "1.3.0",
-        "spdy": "^4.0.0",
+        "sockjs-client": "1.4.0",
+        "spdy": "^4.0.1",
         "strip-ansi": "^3.0.1",
         "supports-color": "^6.1.0",
         "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.7.0",
+        "webpack-dev-middleware": "^3.7.2",
         "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
         "yargs": "12.0.5"
       },
       "dependencies": {
@@ -17777,21 +17776,12 @@
             "resolve-cwd": "^2.0.0"
           }
         },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+        "is-absolute-url": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+          "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
           "dev": true
         },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-          "dev": true,
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
-        },
         "locate-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -17802,44 +17792,16 @@
             "path-exists": "^3.0.0"
           }
         },
-        "mem": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-          "dev": true,
-          "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^2.0.0",
-            "p-is-promise": "^2.0.0"
-          }
-        },
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-          "dev": true,
-          "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
-          }
-        },
         "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -17869,21 +17831,10 @@
             "find-up": "^3.0.0"
           }
         },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
         "strip-ansi": {
@@ -17947,18 +17898,18 @@
       }
     },
     "webpack-merge": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
-      "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.15"
       }
     },
     "webpack-sources": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
-      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
       "requires": {
         "source-list-map": "^2.0.0",
@@ -18285,9 +18236,9 @@
       }
     },
     "ws": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
       "requires": {
         "async-limiter": "~1.0.0"
       }
@@ -18322,9 +18273,9 @@
       "dev": true
     },
     "yallist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "yaml-loader": {
       "version": "0.5.0",
@@ -18336,16 +18287,16 @@
       }
     },
     "yargs": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
-      "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+      "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
       "dev": true,
       "requires": {
         "cliui": "^4.0.0",
         "decamelize": "^1.1.1",
         "find-up": "^2.1.0",
         "get-caller-file": "^1.0.1",
-        "os-locale": "^2.0.0",
+        "os-locale": "^3.1.0",
         "require-directory": "^2.1.1",
         "require-main-filename": "^1.0.1",
         "set-blocking": "^2.0.0",
@@ -18418,6 +18369,17 @@
         "strip-indent": "^2.0.0"
       },
       "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
         "execa": {
           "version": "0.8.0",
           "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
@@ -18469,9 +18431,9 @@
       "integrity": "sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g=="
     },
     "zen-observable-ts": {
-      "version": "0.8.19",
-      "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.19.tgz",
-      "integrity": "sha512-u1a2rpE13G+jSzrg3aiCqXU5tN2kw41b+cBZGmnc+30YimdkKiDj9bTowcB41eL77/17RF/h+393AuVgShyheQ==",
+      "version": "0.8.20",
+      "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz",
+      "integrity": "sha512-2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA==",
       "requires": {
         "tslib": "^1.9.3",
         "zen-observable": "^0.8.0"
diff --git a/yarn.lock b/yarn.lock
index 7f34761d..dd067004 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@apollographql/apollo-tools@^0.3.6":
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.3.7.tgz#3bc9c35b9fff65febd4ddc0c1fc04677693a3d40"
-  integrity sha512-+ertvzAwzkYmuUtT8zH3Zi6jPdyxZwOgnYaZHY7iLnMVJDhQKWlkyjLMF8wyzlPiEdDImVUMm5lOIBZo7LkGlg==
+"@apollographql/apollo-tools@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.4.0.tgz#8a1a0ab7a0bb12ccc03b72e4a104cfa5d969fd5f"
+  integrity sha512-7wEO+S+zgz/wVe3ilFQqICufRBYYDSNUkd1V03JWvXuSydbYq2SM5EgvWmFF+04iadt+aQ0XCCsRzCzRPQODfQ==
   dependencies:
     apollo-env "0.5.1"
 
@@ -22,17 +22,17 @@
     "@babel/highlight" "^7.0.0"
 
 "@babel/core@^7.0.0", "@babel/core@^7.0.1":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
-  integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91"
+  integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.5.5"
-    "@babel/helpers" "^7.5.5"
-    "@babel/parser" "^7.5.5"
-    "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
+    "@babel/generator" "^7.6.2"
+    "@babel/helpers" "^7.6.2"
+    "@babel/parser" "^7.6.2"
+    "@babel/template" "^7.6.0"
+    "@babel/traverse" "^7.6.2"
+    "@babel/types" "^7.6.0"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -41,16 +41,15 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf"
-  integrity sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==
+"@babel/generator@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03"
+  integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==
   dependencies:
-    "@babel/types" "^7.5.5"
+    "@babel/types" "^7.6.0"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
-    trim-right "^1.0.1"
 
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
@@ -76,10 +75,10 @@
     "@babel/traverse" "^7.4.4"
     "@babel/types" "^7.4.4"
 
-"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"
-  integrity sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==
+"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f"
+  integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-member-expression-to-functions" "^7.5.5"
@@ -219,14 +218,14 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz#63908d2a73942229d1e6685bc2a0e730dde3b75e"
-  integrity sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==
+"@babel/helpers@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz#681ffe489ea4dcc55f23ce469e58e59c1c045153"
+  integrity sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==
   dependencies:
-    "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
+    "@babel/template" "^7.6.0"
+    "@babel/traverse" "^7.6.2"
+    "@babel/types" "^7.6.0"
 
 "@babel/highlight@^7.0.0":
   version "7.5.0"
@@ -237,10 +236,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.4.4", "@babel/parser@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz#02f077ac8817d3df4a832ef59de67565e71cca4b"
-  integrity sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==
+"@babel/parser@^7.0.0", "@babel/parser@^7.6.0", "@babel/parser@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1"
+  integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
@@ -260,11 +259,11 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-proposal-decorators@^7.1.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"
-  integrity sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.6.0.tgz#6659d2572a17d70abd68123e89a12a43d90aa30c"
+  integrity sha512-ZSyYw9trQI50sES6YxREXKu+4b7MAg6Qx2cvyDDYjP2Hpzd3FleOUwC9cqn1+za8d0A2ZU8SHujxFao956efUg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.4.4"
+    "@babel/helper-create-class-features-plugin" "^7.6.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-decorators" "^7.2.0"
 
@@ -284,10 +283,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.3.4", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58"
-  integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==
+"@babel/plugin-proposal-object-rest-spread@^7.3.4", "@babel/plugin-proposal-object-rest-spread@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"
+  integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -301,21 +300,21 @@
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
 "@babel/plugin-proposal-optional-chaining@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz#ae454f4c21c6c2ce8cb2397dc332ae8b420c5441"
-  integrity sha512-ea3Q6edZC/55wEBVZAEz42v528VulyO0eir+7uky/sT4XRcdkWJcFi1aPtitTlwUzGnECWJNExWww1SStt+yWw==
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.6.0.tgz#e9bf1f9b9ba10c77c033082da75f068389041af8"
+  integrity sha512-kj4gkZ6qUggkprRq3Uh5KP8XnE1MdIO0J7MhdDX8+rAbB6dJ2UrensGIS+0NPZAaaJ1Vr0PN6oLUgXMU1uMcSg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-chaining" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.2.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
-  integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
+"@babel/plugin-proposal-unicode-property-regex@^7.2.0", "@babel/plugin-proposal-unicode-property-regex@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz#05413762894f41bfe42b9a5e80919bd575dcc802"
+  integrity sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    regexpu-core "^4.6.0"
 
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
@@ -396,10 +395,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.3.4", "@babel/plugin-transform-block-scoping@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz#a35f395e5402822f10d2119f6f8e045e3639a2ce"
-  integrity sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==
+"@babel/plugin-transform-block-scoping@^7.3.4", "@babel/plugin-transform-block-scoping@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz#96c33ab97a9ae500cc6f5b19e04a7e6553360a79"
+  integrity sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
@@ -425,21 +424,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.2.0", "@babel/plugin-transform-destructuring@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
-  integrity sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==
+"@babel/plugin-transform-destructuring@^7.2.0", "@babel/plugin-transform-destructuring@^7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6"
+  integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.2.0", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
-  integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
+"@babel/plugin-transform-dotall-regex@^7.2.0", "@babel/plugin-transform-dotall-regex@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz#44abb948b88f0199a627024e1508acaf8dc9b2f9"
+  integrity sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    regexpu-core "^4.6.0"
 
 "@babel/plugin-transform-duplicate-keys@^7.2.0", "@babel/plugin-transform-duplicate-keys@^7.5.0":
   version "7.5.0"
@@ -494,10 +493,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.2.0", "@babel/plugin-transform-modules-commonjs@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
-  integrity sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==
+"@babel/plugin-transform-modules-commonjs@^7.2.0", "@babel/plugin-transform-modules-commonjs@^7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486"
+  integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==
   dependencies:
     "@babel/helper-module-transforms" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -521,12 +520,12 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.3.0", "@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
-  integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.3.0", "@babel/plugin-transform-named-capturing-groups-regex@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz#c1ca0bb84b94f385ca302c3932e870b0fb0e522b"
+  integrity sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g==
   dependencies:
-    regexp-tree "^0.1.6"
+    regexpu-core "^4.6.0"
 
 "@babel/plugin-transform-new-target@^7.0.0", "@babel/plugin-transform-new-target@^7.4.4":
   version "7.4.4"
@@ -574,9 +573,9 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-runtime@^7.4.0":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz#a6331afbfc59189d2135b2e09474457a8e3d28bc"
-  integrity sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz#2669f67c1fae0ae8d8bf696e4263ad52cb98b6f8"
+  integrity sha512-cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -590,10 +589,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-spread@^7.2.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
-  integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
+"@babel/plugin-transform-spread@^7.2.0", "@babel/plugin-transform-spread@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"
+  integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -620,28 +619,28 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.2.0", "@babel/plugin-transform-unicode-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
-  integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
+"@babel/plugin-transform-unicode-regex@^7.2.0", "@babel/plugin-transform-unicode-regex@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz#b692aad888a7e8d8b1b214be6b9dc03d5031f698"
+  integrity sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
+    regexpu-core "^4.6.0"
 
 "@babel/preset-env@^7.0.0":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz#bc470b53acaa48df4b8db24a570d6da1fef53c9a"
-  integrity sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz#abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"
+  integrity sha512-Ru7+mfzy9M1/YTEtlDS8CD45jd22ngb9tXnn64DvQK3ooyqSw9K4K9DUWmYknTTVk4TqygL9dqCrZgm1HMea/Q==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-dynamic-import" "^7.5.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.5.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.6.2"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
@@ -650,11 +649,11 @@
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
     "@babel/plugin-transform-async-to-generator" "^7.5.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.5.5"
+    "@babel/plugin-transform-block-scoping" "^7.6.2"
     "@babel/plugin-transform-classes" "^7.5.5"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.5.0"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/plugin-transform-destructuring" "^7.6.0"
+    "@babel/plugin-transform-dotall-regex" "^7.6.2"
     "@babel/plugin-transform-duplicate-keys" "^7.5.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
     "@babel/plugin-transform-for-of" "^7.4.4"
@@ -662,10 +661,10 @@
     "@babel/plugin-transform-literals" "^7.2.0"
     "@babel/plugin-transform-member-expression-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.5.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.5.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.6.0"
     "@babel/plugin-transform-modules-systemjs" "^7.5.0"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.2"
     "@babel/plugin-transform-new-target" "^7.4.4"
     "@babel/plugin-transform-object-super" "^7.5.5"
     "@babel/plugin-transform-parameters" "^7.4.4"
@@ -673,12 +672,12 @@
     "@babel/plugin-transform-regenerator" "^7.4.5"
     "@babel/plugin-transform-reserved-words" "^7.2.0"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.2.0"
+    "@babel/plugin-transform-spread" "^7.6.2"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
     "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.4.4"
-    "@babel/types" "^7.5.5"
+    "@babel/plugin-transform-unicode-regex" "^7.6.2"
+    "@babel/types" "^7.6.0"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"
@@ -735,48 +734,48 @@
     semver "^5.3.0"
 
 "@babel/runtime-corejs2@^7.2.0":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.5.5.tgz#c3214c08ef20341af4187f1c9fbdc357fbec96b2"
-  integrity sha512-FYATQVR00NSNi7mUfpPDp7E8RYMXDuO8gaix7u/w3GekfUinKgX1AcTxs7SoiEmoEW9mbpjrwqWSW6zCmw5h8A==
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.6.2.tgz#062f8e31f3df30fc1a3dea68aa1bd854e06e9ba6"
+  integrity sha512-wdyVKnTv9Be4YlwF/7pByYNfcl23qC21aAQ0aIaZOo2ZOvhFEyJdBLJClYZ9i+Pmrz7sUQgg/MwbJa2RZTkygg==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
 "@babel/runtime@^7.0.0":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
-  integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
+  integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.1.0", "@babel/template@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
-  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
+"@babel/template@^7.1.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
+  integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/parser" "^7.6.0"
+    "@babel/types" "^7.6.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz#f664f8f368ed32988cd648da9f72d5ca70f165bb"
-  integrity sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c"
+  integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.5.5"
+    "@babel/generator" "^7.6.2"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.5.5"
-    "@babel/types" "^7.5.5"
+    "@babel/parser" "^7.6.2"
+    "@babel/types" "^7.6.0"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a"
-  integrity sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0":
+  version "7.6.1"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
+  integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.13"
@@ -825,64 +824,59 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@fortawesome/fontawesome-common-types@^0.2.19":
-  version "0.2.19"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.19.tgz#754a0f85e1290858152e1c05700ab502b11197f1"
-  integrity sha512-nd2Ul/CUs8U9sjofQYAALzOGpgkVJQgEhIJnOHaoyVR/LeC3x2mVg4eB910a4kS6WgLPebAY0M2fApEI497raQ==
+"@fortawesome/fontawesome-common-types@^0.2.25":
+  version "0.2.25"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.25.tgz#6df015905081f2762e5cfddeb7a20d2e9b16c786"
+  integrity sha512-3RuZPDuuPELd7RXtUqTCfed14fcny9UiPOkdr2i+cYxBoTOfQgxcDoq77fHiiHcgWuo1LoBUpvGxFF1H/y7s3Q==
 
 "@fortawesome/fontawesome-svg-core@^1.2.2":
-  version "1.2.19"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.19.tgz#0eca1ce9285c3d99e6e340633ee8f615f9d1a2e0"
-  integrity sha512-D4ICXg9oU08eF9o7Or392gPpjmwwgJu8ecCFusthbID95CLVXOgIyd4mOKD9Nud5Ckz+Ty59pqkNtThDKR0erA==
+  version "1.2.25"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.25.tgz#24b03391d14f0c6171e8cad7057c687b74049790"
+  integrity sha512-MotKnn53JKqbkLQiwcZSBJVYtTgIKFbh7B8+kd05TSnfKYPFmjKKI59o2fpz5t0Hzl35vVGU6+N4twoOpZUrqA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.19"
+    "@fortawesome/fontawesome-common-types" "^0.2.25"
 
 "@fortawesome/free-solid-svg-icons@^5.2.0":
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.9.0.tgz#1c73e7bac17417d23f934d83f7fff5b100a7fda9"
-  integrity sha512-U8YXPfWcSozsCW0psCtlRGKjjRs5+Am5JJwLOUmVHFZbIEWzaz4YbP84EoPwUsVmSAKrisu3QeNcVOtmGml0Xw==
+  version "5.11.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz#2f2f1459743a27902b76655a0d0bc5ec4d945631"
+  integrity sha512-zBue4i0PAZJUXOmLBBvM7L0O7wmsDC8dFv9IhpW5QL4kT9xhhVUsYg/LX1+5KaukWq4/cbDcKT+RT1aRe543sg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.19"
+    "@fortawesome/fontawesome-common-types" "^0.2.25"
 
 "@fortawesome/vue-fontawesome@^0.1.1":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.6.tgz#18a0f4263b90f65180fc927325ba01896276ea04"
-  integrity sha512-HAGRbrOuGDwwUmCYdpzR0hhNQ3EE30dOS4JiJKcoZ+S4M210CxyU0OXCgzIg3HzK/23rlpHbV8zi9PDDZDnuIw==
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.7.tgz#121867297cafd141af78c67d92ab9f1ad4b7328b"
+  integrity sha512-YCw2Q2m4fxzyFsPOH3uDYMoJztTD+pT+AAyse4LFpbdrBg+r8ueaVT8BFnXEjrGwMDJJeXrwJ5AOC6q/JWBI4w==
 
 "@hapi/address@2.x.x":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a"
-  integrity sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"
+  integrity sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==
 
-"@hapi/hoek@6.x.x":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-6.2.4.tgz#4b95fbaccbfba90185690890bdf1a2fbbda10595"
-  integrity sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A==
+"@hapi/bourne@1.x.x":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
+  integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
 "@hapi/hoek@8.x.x":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.0.2.tgz#f63a5ff00e891a4e7aa98f11119f9515c6672032"
-  integrity sha512-O6o6mrV4P65vVccxymuruucb+GhP2zl9NLCG8OdoFRS8BEGw3vwpPp20wpAtpbQQxz1CEUtmxJGgWhjq1XA3qw==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.3.0.tgz#2b9db1cd00f3891005c77b3a8d608b88a6d0aa4d"
+  integrity sha512-C0QL9bmgUXTSuf8nDeGrpMjtJG7tPUr8wG6/wxPbP62tGwCwQtdMSJYfESowmY4P3Hn593f+8OzNY5bckcu/LQ==
 
 "@hapi/joi@^15.0.1":
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.0.tgz#940cb749b5c55c26ab3b34ce362e82b6162c8e7a"
-  integrity sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
+  integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
   dependencies:
     "@hapi/address" "2.x.x"
-    "@hapi/hoek" "6.x.x"
-    "@hapi/marker" "1.x.x"
+    "@hapi/bourne" "1.x.x"
+    "@hapi/hoek" "8.x.x"
     "@hapi/topo" "3.x.x"
 
-"@hapi/marker@1.x.x":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@hapi/marker/-/marker-1.0.0.tgz#65b0b2b01d1be06304886ce9b4b77b1bfb21a769"
-  integrity sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA==
-
 "@hapi/topo@3.x.x":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.2.tgz#57cc1317be1a8c5f47c124f9b0e3c49cd78424d2"
-  integrity sha512-r+aumOqJ5QbD6aLPJWqVjMAPsx5pZKz+F5yPqXZ/WWG9JTtHbQqlzrJoknJ0iJxLj9vlXtmpSdjlkszseeG8OA==
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.5.tgz#3baea17e456530edad69a75c3fc7cde97dd6d331"
+  integrity sha512-bi9m1jrui9LlvtVdLaHv0DqeOoe+I8dep+nEcTgW6XxJHL3xArQcilYz3tIp0cRC4gWlsVtABK7vNKg4jzEmAA==
   dependencies:
     "@hapi/hoek" "8.x.x"
 
@@ -982,17 +976,17 @@
     error-stack-parser "^2.0.0"
     string-width "^2.0.0"
 
-"@types/accepts@^1.3.5":
+"@types/accepts@*", "@types/accepts@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575"
   integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==
   dependencies:
     "@types/node" "*"
 
-"@types/body-parser@*", "@types/body-parser@1.17.0":
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
-  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
+"@types/body-parser@*", "@types/body-parser@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz#18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897"
+  integrity sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -1004,10 +998,20 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cookies@*":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.4.tgz#26dedf791701abc0e36b5b79a5722f40e455f87b"
+  integrity sha512-oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw==
+  dependencies:
+    "@types/connect" "*"
+    "@types/express" "*"
+    "@types/keygrip" "*"
+    "@types/node" "*"
+
 "@types/cors@^2.8.4":
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.5.tgz#c0c54c4e643e1d943d447292f2baf9dc82cfc8ec"
-  integrity sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==
+  version "2.8.6"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.6.tgz#cfaab33c49c15b1ded32f235111ce9123009bd02"
+  integrity sha512-invOmosX0DqbpA+cE2yoHGUlF/blyf7nB0OGYBBiH27crcVm5NmFaZkLP4Ta1hGaesckCi5lVLlydNJCxkTOSg==
   dependencies:
     "@types/express" "*"
 
@@ -1017,22 +1021,29 @@
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
 "@types/express-serve-static-core@*":
-  version "4.16.7"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz#50ba6f8a691c08a3dd9fa7fba25ef3133d298049"
-  integrity sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==
+  version "4.16.9"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz#69e00643b0819b024bdede95ced3ff239bb54558"
+  integrity sha512-GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==
   dependencies:
     "@types/node" "*"
     "@types/range-parser" "*"
 
-"@types/express@*", "@types/express@4.17.0":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.0.tgz#49eaedb209582a86f12ed9b725160f12d04ef287"
-  integrity sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==
+"@types/express@*", "@types/express@4.17.1":
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.1.tgz#4cf7849ae3b47125a567dfee18bfca4254b88c5c"
+  integrity sha512-VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
     "@types/serve-static" "*"
 
+"@types/fs-capacitor@*":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz#17113e25817f584f58100fb7a08eed288b81956e"
+  integrity sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/glob@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
@@ -1042,6 +1053,45 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/graphql-upload@^8.0.0":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@types/graphql-upload/-/graphql-upload-8.0.3.tgz#b371edb5f305a2a1f7b7843a890a2a7adc55c3ec"
+  integrity sha512-hmLg9pCU/GmxBscg8GCr1vmSoEmbItNNxdD5YH2TJkXm//8atjwuprB+xJBK714JG1dkxbbhp5RHX+Pz1KsCMA==
+  dependencies:
+    "@types/express" "*"
+    "@types/fs-capacitor" "*"
+    "@types/koa" "*"
+    graphql "^14.5.3"
+
+"@types/http-assert@*":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b"
+  integrity sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==
+
+"@types/keygrip@*":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.1.tgz#ff540462d2fb4d0a88441ceaf27d287b01c3d878"
+  integrity sha1-/1QEYtL7TQqIRBzq8n0oewHD2Hg=
+
+"@types/koa-compose@*":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.4.tgz#76a461634a59c3e13449831708bb9b355fb1548e"
+  integrity sha512-ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA==
+  dependencies:
+    "@types/koa" "*"
+
+"@types/koa@*":
+  version "2.0.50"
+  resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.0.50.tgz#c295cbbd59f4898e7a8794c0f2e42e60da83aab2"
+  integrity sha512-TcgOD2lh0EISSadAk1DOBYw7kNoY9XdeB3vEMOKiDDaTMYm+V54nyPsU7Ulb/htb5OBIR79RgTeCWntCcophLw==
+  dependencies:
+    "@types/accepts" "*"
+    "@types/cookies" "*"
+    "@types/http-assert" "*"
+    "@types/keygrip" "*"
+    "@types/koa-compose" "*"
+    "@types/node" "*"
+
 "@types/long@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef"
@@ -1058,14 +1108,14 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*", "@types/node@>=6":
-  version "12.6.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz#e469b4bf9d1c9832aee4907ba8a051494357c12c"
-  integrity sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg==
+  version "12.7.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.11.tgz#be879b52031cfb5d295b047f5462d8ef1a716446"
+  integrity sha512-Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw==
 
 "@types/node@^10.1.0":
-  version "10.14.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.13.tgz#ac786d623860adf39a3f51d629480aacd6a6eec7"
-  integrity sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==
+  version "10.14.20"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.20.tgz#c4378d9d6a62faa5c9aafffc3d726b5a1e7367c6"
+  integrity sha512-An+MXSV8CGXz/BO9C1KKsoJ/8WDrvlNUaRMsm2h+IHZuSyQkM8U5bJJkb8ItLKA73VePG/nUK+t+EuW2IWuhsQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1083,9 +1133,9 @@
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
 "@types/serve-static@*":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
-  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1"
+  integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
@@ -1101,11 +1151,10 @@
   integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
 
 "@types/ws@^6.0.0":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.1.tgz#ca7a3f3756aa12f62a0a62145ed14c6db25d5a28"
-  integrity sha512-EzH8k1gyZ4xih/MaZTXwT2xOkPiIMSrhQ9b8wrlX88L0T02eYsddatQlwVFlEPyEqV0ChpdpNnE51QPH6NVT4Q==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.3.tgz#b772375ba59d79066561c8d87500144d674ba6b3"
+  integrity sha512-yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==
   dependencies:
-    "@types/events" "*"
     "@types/node" "*"
 
 "@types/zen-observable@^0.8.0":
@@ -1130,10 +1179,10 @@
     lodash.kebabcase "^4.1.1"
     svg-tags "^1.0.0"
 
-"@vue/babel-preset-app@^3.9.2":
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-3.9.2.tgz#b72a9b06abbe3f8f272783be13951271277be338"
-  integrity sha512-0suuCbu4jkVcVYBjPmuKxeDbrhwThYZHu3DUmtsVuOzFEGeXmco60VmXveniL/bnDUdZyknSuYP4FxgS34gw9w==
+"@vue/babel-preset-app@^3.11.0":
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-3.11.0.tgz#52bf79c15560a304a13f4770e3e5530e01dd6173"
+  integrity sha512-fcCq9nuGGx1WGnyaKHvIC8RnWjISXGf1rJH4mN9+bymDfosgDbwnfV4TYvTZlyK1/aTHEEpIoO3XimTXBo7QBw==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -1150,16 +1199,16 @@
     core-js "^2.6.5"
 
 "@vue/babel-preset-jsx@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.0.0.tgz#e515cd453a5a8ea6b0f30b2bb92f266d8ab4e9f5"
-  integrity sha512-5CbDu/QHS+TtQNw5aYAffiMxBBB2Eo9+RJpS8X+6FJbdG5Rvc4TVipEqkrg0pJviWadNg7TEy0Uz4o7VNXeIZw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.0.tgz#c8001329f5b372297a3111a251eb4f9e956c1266"
+  integrity sha512-EeZ9gwEmu79B4A6LMLAw5cPCVYIcbKWgJgJafWtLzh1S+SgERUmTkVQ9Vx4k8zYBiCuxHK3XziZ3VJIMau7THA==
   dependencies:
     "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
     "@vue/babel-plugin-transform-vue-jsx" "^1.0.0"
     "@vue/babel-sugar-functional-vue" "^1.0.0"
     "@vue/babel-sugar-inject-h" "^1.0.0"
     "@vue/babel-sugar-v-model" "^1.0.0"
-    "@vue/babel-sugar-v-on" "^1.0.0"
+    "@vue/babel-sugar-v-on" "^1.1.0"
 
 "@vue/babel-sugar-functional-vue@^1.0.0":
   version "1.0.0"
@@ -1187,70 +1236,70 @@
     html-tags "^2.0.0"
     svg-tags "^1.0.0"
 
-"@vue/babel-sugar-v-on@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.0.0.tgz#a633ee8fe205763e865b011246981b7f89668033"
-  integrity sha512-2aqJaDLKdSSGlxZU+GjFERaSNUaa6DQreV+V/K4W/6Lxj8520/r1lChWEa/zuAoPD2Vhy0D2QrqqO+I0D6CkKw==
+"@vue/babel-sugar-v-on@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.0.tgz#1f2b35eeeabb87eaf8925931f4d34fd8e6404a45"
+  integrity sha512-8DwAj/RLpmrDP4eZ3erJcKcyuLArLUYagNODTsSQrMdG5zmLJoFFtEjODfYRh/XxM2wXv9Wxe+HAB41FQxxwQA==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
     "@vue/babel-plugin-transform-vue-jsx" "^1.0.0"
     camelcase "^5.0.0"
 
-"@vue/cli-overlay@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-3.9.0.tgz#11f513d1fa11b0135fb8ba8b88d228df0dc542e0"
-  integrity sha512-QfyvpJl2ChehBT2qzb5EvW921JxW94uFL3+lHa6VT42ImH8awrvkTGZmxTQWhHvATa7r0LKy7M7ZRMyo547esg==
+"@vue/cli-overlay@^3.11.0":
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-3.11.0.tgz#88d49060095c9c5168ac6014d4c4eb66e7dd4874"
+  integrity sha512-yYZP27vjioWmohwXQ9mTPHHxktfAaTM6RDehyG83yvY07wcdxhwrNNCMm8eE9My/K2F8oAPf8uoDZZmkr/EXBw==
 
 "@vue/cli-plugin-babel@^3.9.0":
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-3.9.2.tgz#8ff962a383aaeafd2b280998428a57ea23e9539c"
-  integrity sha512-XqfmGjUGnnJ3NA+HC31F6nkBvB9pFDhk4Lxeao8ZNJcEjKNEBYjlmHunJQdIe/jEXXum6U+U/ZE6DjDStHTIMw==
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-3.11.0.tgz#247a7233100a33ea0fd9f7d30bdf2b9b554e9e88"
+  integrity sha512-RSq9goefilvUMYxbeQS8cZxt6zZnvBIb1xK4NWX0NBtqKzJmIjtJzDAQvKgjnZ/USRu6p6X2IRj4Wum8UCUqow==
   dependencies:
     "@babel/core" "^7.0.0"
-    "@vue/babel-preset-app" "^3.9.2"
-    "@vue/cli-shared-utils" "^3.9.0"
+    "@vue/babel-preset-app" "^3.11.0"
+    "@vue/cli-shared-utils" "^3.11.0"
     babel-loader "^8.0.5"
-    webpack ">=4 < 4.29"
+    webpack "^4.0.0"
 
 "@vue/cli-plugin-e2e-cypress@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-3.9.0.tgz#20e49a6b633886985b6cbd84c636ec97a5740a58"
-  integrity sha512-OMBl81ZDKvxZRSb3M/VWSFpbngcwcubi2MF/Qi+BGz+8CLdfJuPUqKR1CR36pUjn2WGb4B8hsC/lkCqlrYCG3g==
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-3.11.0.tgz#9f98c9773c9ad43f305c7e0ce6204969cf55a627"
+  integrity sha512-k7oT2/sxCSC/ZuHTSbp5VeBu5YnAfmiplS96aoF5JatAi8oP+x58qLc+pBFT1DP1IqacP1U/685v0pJQjo5Ztg==
   dependencies:
-    "@vue/cli-shared-utils" "^3.9.0"
+    "@vue/cli-shared-utils" "^3.11.0"
     cypress "^3.2.0"
     eslint-plugin-cypress "^2.2.1"
 
 "@vue/cli-plugin-eslint@^3.9.0":
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.9.2.tgz#747c616b13a11f34ac80554eee899cbfcd1977b8"
-  integrity sha512-AdvWJN+4Px2r3hbTDM2/rCtTcS6VyI7XuRljbfr2V9nF9cJiH4qsXFrTCRj3OgupbXJ14fUGKrLxmznLZIm1jA==
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.11.0.tgz#99b14a9d4ab05d96fc707d958db9de4856133329"
+  integrity sha512-cZWTXFbMu7/Ha6uAyvFsOxjC82afmHk0M9ye2MyeXmkvdL+tB2rcIITbd9HZypPaky1qv46Mp5l/lSd9W4PVCA==
   dependencies:
-    "@vue/cli-shared-utils" "^3.9.0"
+    "@vue/cli-shared-utils" "^3.11.0"
     babel-eslint "^10.0.1"
     eslint-loader "^2.1.2"
     globby "^9.2.0"
-    webpack ">=4 < 4.29"
+    webpack "^4.0.0"
     yorkie "^2.0.0"
   optionalDependencies:
     eslint "^4.19.1"
     eslint-plugin-vue "^4.7.1"
 
 "@vue/cli-plugin-pwa@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-3.9.0.tgz#5b26d91bc7dd66fcddd593f47e18a8c88b2e3876"
-  integrity sha512-wOoSePJ7nbWiV8jRAt2i5IM3pWrf2TQZMcaf062wMLva/cLDOivENDGOWxL8kkCjfduQGXUkFYtqZCT1QKph8g==
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-3.11.0.tgz#f7d26b598c00755491326ecebe68af6417ad6b46"
+  integrity sha512-Ua215xZRSM4LeSa2BOiHGRxcYxCcX+J0RoiflTsUhMEICJj0kwGvcjHcq8MsrmydXqHSdAKtVVJpe2CUZix2XQ==
   dependencies:
-    "@vue/cli-shared-utils" "^3.9.0"
-    webpack ">=4 < 4.29"
+    "@vue/cli-shared-utils" "^3.11.0"
+    webpack "^4.0.0"
     workbox-webpack-plugin "^3.6.3"
 
 "@vue/cli-plugin-unit-jest@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-3.9.0.tgz#0662adee9467006381b9cddc7fb3b0a21ccbbd07"
-  integrity sha512-FzUeTXXM7VUbjNDrqbj/AoUXZd0FZVrW936VO0W57r7uDgv+bh5hcEyzZnOaqFUOHYNFhl0RYD528/Uq5Dgm0A==
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-3.11.0.tgz#d7d34f2d91d2b25ee00585e218206d6a344822d3"
+  integrity sha512-UwdySXhSar9npsYmLJ45Rk4kljOwNQDHRMvmWtGIUqmES0wBYsWLed3dpcumTXTsumXrVdrY6o74L9yqCNT/xw==
   dependencies:
-    "@vue/cli-shared-utils" "^3.9.0"
+    "@vue/cli-shared-utils" "^3.11.0"
     babel-jest "^23.6.0"
     babel-plugin-transform-es2015-modules-commonjs "^6.26.2"
     jest "^23.6.0"
@@ -1260,15 +1309,15 @@
     vue-jest "^3.0.4"
 
 "@vue/cli-service@^3.9.0":
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.9.3.tgz#4bd5786465afb8b608c5c7fc9661390e747ea756"
-  integrity sha512-CZE9PP4HH9bK4qAaLbTUB3tubggI+aRSbgB/QYSZrVlhtMpuVFZPj2QHbIvJQZTI2cG6LFQtLTZWXKeqo5lbAQ==
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.11.0.tgz#356526e9100a7a0a258e3c4a13ff421de29eadde"
+  integrity sha512-HSU4wHlYKQt8O968JUz/AeYvFSokxJjMkr7dgVNVb6rpBn859Emkr960plWGr1z1hc3qNOwLuSUGk5OSfq1inA==
   dependencies:
     "@intervolga/optimize-cssnano-plugin" "^1.0.5"
     "@soda/friendly-errors-webpack-plugin" "^1.7.1"
-    "@vue/cli-overlay" "^3.9.0"
-    "@vue/cli-shared-utils" "^3.9.0"
-    "@vue/component-compiler-utils" "^2.6.0"
+    "@vue/cli-overlay" "^3.11.0"
+    "@vue/cli-shared-utils" "^3.11.0"
+    "@vue/component-compiler-utils" "^3.0.0"
     "@vue/preload-webpack-plugin" "^1.1.0"
     "@vue/web-component-wrapper" "^1.2.0"
     acorn "^6.1.1"
@@ -1315,16 +1364,16 @@
     thread-loader "^2.1.2"
     url-loader "^1.1.2"
     vue-loader "^15.7.0"
-    webpack ">=4 < 4.29"
+    webpack "^4.0.0"
     webpack-bundle-analyzer "^3.3.0"
     webpack-chain "^4.11.0"
     webpack-dev-server "^3.4.1"
     webpack-merge "^4.2.1"
 
-"@vue/cli-shared-utils@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz#cb56a443bf763a873849a11d07e9e7638aa16cc2"
-  integrity sha512-wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g==
+"@vue/cli-shared-utils@^3.11.0":
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.11.0.tgz#a3d6f809b0dfb367e626b71405f85dea0631310b"
+  integrity sha512-D7pst/4v9H1DD66fLxlZOwRR09R03MV0ROdKxBHmh3FmnApCA/RiaolFA/8w+B3CnevYMlV3SJ5fOAgedbswbA==
   dependencies:
     "@hapi/joi" "^15.0.1"
     chalk "^2.4.1"
@@ -1339,21 +1388,6 @@
     semver "^6.0.0"
     string.prototype.padstart "^3.0.0"
 
-"@vue/component-compiler-utils@^2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b"
-  integrity sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw==
-  dependencies:
-    consolidate "^0.15.1"
-    hash-sum "^1.0.2"
-    lru-cache "^4.1.2"
-    merge-source-map "^1.1.0"
-    postcss "^7.0.14"
-    postcss-selector-parser "^5.0.0"
-    prettier "1.16.3"
-    source-map "~0.6.1"
-    vue-template-es2015-compiler "^1.9.0"
-
 "@vue/component-compiler-utils@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634"
@@ -1379,9 +1413,9 @@
     eslint-plugin-import "^2.17.3"
 
 "@vue/preload-webpack-plugin@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.0.tgz#d768dba004261c029b53a77c5ea2d5f9ee4f3cce"
-  integrity sha512-rcn2KhSHESBFMPj5vc5X2pI9bcBNQQixvJXhD5gZ4rN2iym/uH2qfDSQfUS5+qwiz0a85TCkeUs6w6jxFDudbw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz#18723530d304f443021da2292d6ec9502826104a"
+  integrity sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==
 
 "@vue/test-utils@^1.0.0-beta.29":
   version "1.0.0-beta.29"
@@ -1396,148 +1430,151 @@
   resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.2.0.tgz#bb0e46f1585a7e289b4ee6067dcc5a6ae62f1dd1"
   integrity sha512-Xn/+vdm9CjuC9p3Ae+lTClNutrVhsXpzxvoTXXtoys6kVRX9FkueSUAqSWAyZntmVLlR4DosBV4pH8y5Z/HbUw==
 
-"@webassemblyjs/ast@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
-  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
-  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
-"@webassemblyjs/helper-api-error@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
-  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
-"@webassemblyjs/helper-buffer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
-  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
-"@webassemblyjs/helper-code-frame@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
-  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/helper-fsm@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
-  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
-"@webassemblyjs/helper-module-context@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
-  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
-  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
-  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-
-"@webassemblyjs/ieee754@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
-  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
-  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
-  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
-"@webassemblyjs/wasm-edit@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
-  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/helper-wasm-section" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-opt" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/wasm-gen@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
-  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wasm-opt@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
-  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-
-"@webassemblyjs/wasm-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
-  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wast-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
-  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-code-frame" "1.7.11"
-    "@webassemblyjs/helper-fsm" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
-  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
 
 "@wry/context@^0.4.0":
   version "0.4.4"
@@ -1559,15 +1596,15 @@
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 abab@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
-  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.2.tgz#a2fba1b122c69a85caa02d10f9270c7219709a9d"
+  integrity sha512-2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==
 
 abbrev@1:
   version "1.1.1"
@@ -1582,17 +1619,10 @@ accepts@^1.3.5, accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
-  dependencies:
-    acorn "^5.0.0"
-
 acorn-globals@^4.1.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
-  integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
@@ -1605,9 +1635,9 @@ acorn-jsx@^3.0.0:
     acorn "^3.0.4"
 
 acorn-jsx@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
-  integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f"
+  integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==
 
 acorn-walk@^6.0.1, acorn-walk@^6.1.1:
   version "6.2.0"
@@ -1619,20 +1649,20 @@ acorn@^3.0.4:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
   integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
-acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2:
+acorn@^5.5.0, acorn@^5.5.3:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.7, acorn@^6.1.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3"
-  integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==
+acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.7, acorn@^6.1.1, acorn@^6.2.1:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
+  integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
 
 address@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz#ef8e047847fcd2c5b6f50c16965f924fd99fe709"
-  integrity sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
+  integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
 
 ajv-errors@^1.0.0:
   version "1.0.1"
@@ -1644,7 +1674,7 @@ ajv-keywords@^2.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
   integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
 
-ajv-keywords@^3.1.0:
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
@@ -1746,30 +1776,30 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz#2fb624fe0e84bccab00afee3d0006ed310f22f09"
-  integrity sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==
+anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apollo-cache-control@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.8.0.tgz#08b157e5f8cd86f63608b05d45222de0725ebd5a"
-  integrity sha512-BBnfUmSWRws5dRSDD+R56RLJCE9v6xQuob+i/1Ju9EX4LZszU5JKVmxEvnkJ1bk/BkihjoQXTnP6fJCnt6fCmA==
+apollo-cache-control@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.8.4.tgz#a3650d5e4173953e2a3af995bea62147f1ffe4d7"
+  integrity sha512-IZ1d3AXZtkZhLYo0kWqTbZ6nqLFaeUvLdMESs+9orMadBZ7mvzcAfBwrhKyCWPGeAAZ/jKv8FtYHybpchHgFAg==
   dependencies:
-    apollo-server-env "2.4.0"
-    graphql-extensions "0.8.0"
+    apollo-server-env "^2.4.3"
+    graphql-extensions "^0.10.3"
 
 apollo-cache-inmemory@^1.3.5, apollo-cache-inmemory@^1.3.9:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e"
-  integrity sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ==
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz#826861d20baca4abc45f7ca7a874105905b8525d"
+  integrity sha512-S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg==
   dependencies:
     apollo-cache "^1.3.2"
     apollo-utilities "^1.3.2"
-    optimism "^0.9.0"
+    optimism "^0.10.0"
     ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
@@ -1782,9 +1812,9 @@ apollo-cache@1.3.2, apollo-cache@^1.3.2:
     tslib "^1.9.3"
 
 apollo-client@^2.4.12, apollo-client@^2.4.5:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.3.tgz#9bb2d42fb59f1572e51417f341c5f743798d22db"
-  integrity sha512-DS8pmF5CGiiJ658dG+mDn8pmCMMQIljKJSTeMNHnFuDLV0uAPZoeaAwVFiAmB408Ujqt92oIZ/8yJJAwSIhd4A==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz#872c32927263a0d34655c5ef8a8949fbb20b6140"
+  integrity sha512-oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ==
   dependencies:
     "@types/zen-observable" "^0.8.0"
     apollo-cache "1.3.2"
@@ -1795,34 +1825,35 @@ apollo-client@^2.4.12, apollo-client@^2.4.5:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-apollo-datasource@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.6.0.tgz#823d6be8a3804613b5c56d2972c07db662293fc6"
-  integrity sha512-DOzzYWEOReYRu2vWPKEulqlTb9Xjg67sjVCzve5MXa7GUXjfr8IKioljvfoBMlqm/PpbJVk2ci4n5NIFqoYsrQ==
+apollo-datasource@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.6.3.tgz#b31e089e52adb92fabb536ab8501c502573ffe13"
+  integrity sha512-gRYyFVpJgHE2hhS+VxMeOerxXQ/QYxWG7T6QddfugJWYAG9DRCl65e2b7txcGq2NP3r+O1iCm4GNwhRBDJbd8A==
   dependencies:
-    apollo-server-caching "0.5.0"
-    apollo-server-env "2.4.0"
+    apollo-server-caching "^0.5.0"
+    apollo-server-env "^2.4.3"
 
-apollo-engine-reporting-protobuf@0.4.0:
+apollo-engine-reporting-protobuf@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.0.tgz#e34c192d86493b33a73181fd6be75721559111ec"
   integrity sha512-cXHZSienkis8v4RhqB3YG3DkaksqLpcxApRLTpRMs7IXNozgV7CUPYGFyFBEra1ZFgUyHXx4G9MpelV+n2cCfA==
   dependencies:
     protobufjs "^6.8.6"
 
-apollo-engine-reporting@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.0.tgz#3a9bd011b271593e16d7057044898d0a817b197d"
-  integrity sha512-NMiO3h1cuEBt6QZNGHxivwuyZQnoU/2MMx0gUA8Gyy1ERBhK6P235qoMnvoi34rLmqJuyGPX6tXcab8MpMIzYQ==
+apollo-engine-reporting@^1.4.6:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.6.tgz#83af6689c4ab82d1c62c3f5dde7651975508114f"
+  integrity sha512-acfb7oFnru/8YQdY4x6+7WJbZfzdVETI8Cl+9ImgUrvUnE8P+f2SsGTKXTC1RuUvve4c56PAvaPgE+z8X1a1Mw==
   dependencies:
-    apollo-engine-reporting-protobuf "0.4.0"
+    apollo-engine-reporting-protobuf "^0.4.0"
     apollo-graphql "^0.3.3"
-    apollo-server-env "2.4.0"
-    apollo-server-types "0.2.0"
+    apollo-server-caching "^0.5.0"
+    apollo-server-env "^2.4.3"
+    apollo-server-types "^0.2.4"
     async-retry "^1.2.1"
-    graphql-extensions "0.8.0"
+    graphql-extensions "^0.10.3"
 
-apollo-env@0.5.1:
+apollo-env@0.5.1, apollo-env@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.5.1.tgz#b9b0195c16feadf0fe9fd5563edb0b9b7d9e97d3"
   integrity sha512-fndST2xojgSdH02k5hxk1cbqA9Ti8RX4YzzBoAB4oIe1Puhq7+YlhXGXfXB5Y4XN0al8dLg+5nAkyjNAR2qZTw==
@@ -1832,36 +1863,36 @@ apollo-env@0.5.1:
     sha.js "^2.4.11"
 
 apollo-graphql@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.3.tgz#ce1df194f6e547ad3ce1e35b42f9c211766e1658"
-  integrity sha512-t3CO/xIDVsCG2qOvx2MEbuu4b/6LzQjcBBwiVnxclmmFyAxYCIe7rpPlnLHSq7HyOMlCWDMozjoeWfdqYSaLqQ==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.4.tgz#c1f68591a4775945441d049eff9323542ab0401f"
+  integrity sha512-w+Az1qxePH4oQ8jvbhQBl5iEVvqcqynmU++x/M7MM5xqN1C7m1kyIzpN17gybXlTJXY4Oxej2WNURC2/hwpfYw==
   dependencies:
-    apollo-env "0.5.1"
+    apollo-env "^0.5.1"
     lodash.sortby "^4.7.0"
 
 apollo-link-context@^1.0.8, apollo-link-context@^1.0.9:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.18.tgz#9e700e3314da8ded50057fee0a18af2bfcedbfc3"
-  integrity sha512-aG5cbUp1zqOHHQjAJXG7n/izeMQ6LApd/whEF5z6qZp5ATvcyfSNkCfy3KRJMMZZ3iNfVTs6jF+IUA8Zvf+zeg==
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.19.tgz#3c9ba5bf75ed5428567ce057b8837ef874a58987"
+  integrity sha512-TUi5TyufU84hEiGkpt+5gdH5HkB3Gx46npNfoxR4of3DKBCMuItGERt36RCaryGcU/C3u2zsICU3tJ+Z9LjFoQ==
   dependencies:
-    apollo-link "^1.2.12"
+    apollo-link "^1.2.13"
     tslib "^1.9.3"
 
 apollo-link-error@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.11.tgz#7cd363179616fb90da7866cee85cb00ee45d2f3b"
-  integrity sha512-442DNqn3CNRikDaenMMkoDmCRmkoUx/XyUMlRTZBEFdTw3FYPQLsmDO3hzzC4doY5/BHcn9/jdYh9EeLx4HPsA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.12.tgz#e24487bb3c30af0654047611cda87038afbacbf9"
+  integrity sha512-psNmHyuy3valGikt/XHJfe0pKJnRX19tLLs6P6EHRxg+6q6JMXNVLYPaQBkL0FkwdTCB0cbFJAGRYCBviG8TDA==
   dependencies:
-    apollo-link "^1.2.12"
-    apollo-link-http-common "^0.2.14"
+    apollo-link "^1.2.13"
+    apollo-link-http-common "^0.2.15"
     tslib "^1.9.3"
 
-apollo-link-http-common@^0.2.14, apollo-link-http-common@^0.2.5:
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.14.tgz#d3a195c12e00f4e311c417f121181dcc31f7d0c8"
-  integrity sha512-v6mRU1oN6XuX8beVIRB6OpF4q1ULhSnmy7ScnHnuo1qV6GaFmDcbdvXqxIkAV1Q8SQCo2lsv4HeqJOWhFfApOg==
+apollo-link-http-common@^0.2.15, apollo-link-http-common@^0.2.5:
+  version "0.2.15"
+  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz#304e67705122bf69a9abaded4351b10bc5efd6d9"
+  integrity sha512-+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg==
   dependencies:
-    apollo-link "^1.2.12"
+    apollo-link "^1.2.13"
     ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
@@ -1882,51 +1913,50 @@ apollo-link-state@^0.4.2:
     graphql-anywhere "^4.1.0-alpha.0"
 
 apollo-link-ws@^1.0.9:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.18.tgz#281b9b0826d5fc7e2aa14d2784c5193d8b761112"
-  integrity sha512-nrWh9m7k1FQw1AK1GB1VTJS0o01cpsP2RYmTAh2j+P4lL2/72WgsblhbuF+yA1/jsgVrzg6xa+TNw3UwgGp3+g==
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.19.tgz#dfa871d4df883a8777c9556c872fc892e103daa5"
+  integrity sha512-mRXmeUkc55ixOdYRtfq5rq3o9sboKghKABKroDVhJnkdS56zthBEWMAD+phajujOUbqByxjok0te8ABqByBdeQ==
   dependencies:
-    apollo-link "^1.2.12"
+    apollo-link "^1.2.13"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.1, apollo-link@^1.2.12, apollo-link@^1.2.3:
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.12.tgz#014b514fba95f1945c38ad4c216f31bcfee68429"
-  integrity sha512-fsgIAXPKThyMVEMWQsUN22AoQI+J/pVXcjRGAShtk97h7D8O+SPskFinCGEkxPeQpE83uKaqafB2IyWdjN+J3Q==
+apollo-link@^1.0.0, apollo-link@^1.2.1, apollo-link@^1.2.12, apollo-link@^1.2.13, apollo-link@^1.2.3:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.13.tgz#dff00fbf19dfcd90fddbc14b6a3f9a771acac6c4"
+  integrity sha512-+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==
   dependencies:
     apollo-utilities "^1.3.0"
     ts-invariant "^0.4.0"
     tslib "^1.9.3"
-    zen-observable-ts "^0.8.19"
+    zen-observable-ts "^0.8.20"
 
-apollo-server-caching@0.5.0:
+apollo-server-caching@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.0.tgz#446a37ce2d4e24c81833e276638330a634f7bd46"
   integrity sha512-l7ieNCGxUaUAVAAp600HjbUJxVaxjJygtPV0tPTe1Q3HkPy6LEWoY6mNHV7T268g1hxtPTxcdRu7WLsJrg7ufw==
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.7.0.tgz#c444347dea11149b5b453890506e43dc7e711257"
-  integrity sha512-CXjXAkgcMBCJZpsZgfAY5W7f5thdxUhn75UgzeH28RTUZ2aKi/LjoCixPWRSF1lU4vuEWneAnM8Vg/KCD+29lQ==
+apollo-server-core@^2.9.5:
+  version "2.9.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.5.tgz#b2d9188d7acce5fe92a5460d276794988ffa6737"
+  integrity sha512-SlM/vhjhWb0ayXV3d4gnpq9gh2BsQj+UPfQXfq2X2KG9EH5I1JUH6EtlsctgMCZozirOZmEmUzlqZWSSUOUPgQ==
   dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
+    "@apollographql/apollo-tools" "^0.4.0"
     "@apollographql/graphql-playground-html" "1.6.24"
+    "@types/graphql-upload" "^8.0.0"
     "@types/ws" "^6.0.0"
-    apollo-cache-control "0.8.0"
-    apollo-datasource "0.6.0"
-    apollo-engine-reporting "1.4.0"
-    apollo-engine-reporting-protobuf "0.4.0"
-    apollo-server-caching "0.5.0"
-    apollo-server-env "2.4.0"
-    apollo-server-errors "2.3.1"
-    apollo-server-plugin-base "0.6.0"
-    apollo-server-types "0.2.0"
-    apollo-tracing "0.8.0"
+    apollo-cache-control "^0.8.4"
+    apollo-datasource "^0.6.3"
+    apollo-engine-reporting "^1.4.6"
+    apollo-server-caching "^0.5.0"
+    apollo-server-env "^2.4.3"
+    apollo-server-errors "^2.3.3"
+    apollo-server-plugin-base "^0.6.4"
+    apollo-server-types "^0.2.4"
+    apollo-tracing "^0.8.4"
     fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "0.8.0"
-    graphql-subscriptions "^1.0.0"
+    graphql-extensions "^0.10.3"
     graphql-tag "^2.9.2"
     graphql-tools "^4.0.0"
     graphql-upload "^8.0.2"
@@ -1934,61 +1964,64 @@ apollo-server-core@2.7.0:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
-apollo-server-env@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.0.tgz#6611556c6b627a1636eed31317d4f7ea30705872"
-  integrity sha512-7ispR68lv92viFeu5zsRUVGP+oxsVI3WeeBNniM22Cx619maBUwcYTIC3+Y3LpXILhLZCzA1FASZwusgSlyN9w==
+apollo-server-env@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.3.tgz#9bceedaae07eafb96becdfd478f8d92617d825d2"
+  integrity sha512-23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA==
   dependencies:
     node-fetch "^2.1.2"
     util.promisify "^1.0.0"
 
-apollo-server-errors@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.1.tgz#033cf331463ebb99a563f8354180b41ac6714eb6"
-  integrity sha512-errZvnh0vUQChecT7M4A/h94dnBSRL213dNxpM5ueMypaLYgnp4hiCTWIEaooo9E4yMGd1qA6WaNbLDG2+bjcg==
+apollo-server-errors@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff"
+  integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==
 
 apollo-server-express@^2.2.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.7.0.tgz#c19bf56c32473a76b1eb87237d713018984f838e"
-  integrity sha512-TIOaLyuxD8xIECXjbPfS9HUWgHCKsG3rR4WuTpTreVEB08EsGeg+VcNGn0hmUnch18fPXTciBHWCv/fFV/YhMg==
+  version "2.9.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.5.tgz#383e0a5cb80cf1172b0bc1e565797edd629d750a"
+  integrity sha512-6gonP7g5u2Kr+9cvKE+NuGPe+As7wRbz2yWoyLOym/TdXBmTRU4AKW2Qs+wpNanurzm2xbTa7sEfzrHGmembrQ==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/accepts" "^1.3.5"
-    "@types/body-parser" "1.17.0"
+    "@types/body-parser" "1.17.1"
     "@types/cors" "^2.8.4"
-    "@types/express" "4.17.0"
+    "@types/express" "4.17.1"
     accepts "^1.3.5"
-    apollo-server-core "2.7.0"
-    apollo-server-types "0.2.0"
+    apollo-server-core "^2.9.5"
+    apollo-server-types "^0.2.4"
     body-parser "^1.18.3"
     cors "^2.8.4"
+    express "^4.17.1"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
+    parseurl "^1.3.2"
+    subscriptions-transport-ws "^0.9.16"
     type-is "^1.6.16"
 
-apollo-server-plugin-base@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.0.tgz#4186296ea5d52cfe613961d252a8a2f9e13e6ba6"
-  integrity sha512-BjfyWpHyKwHOe819gk3wEFwbnVp9Xvos03lkkYTTcXS/8G7xO78aUcE65mmyAC56/ZQ0aodNFkFrhwNtWBQWUQ==
+apollo-server-plugin-base@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.4.tgz#63ea4fd0bbb6c4510bc8d0d2ad0a0684c8d0da8c"
+  integrity sha512-4rY+cBAIpQomGWYBtk8hHkLQWHrh5hgIBPQqmhXh00YFdcY+Ob1/cU2/2iqTcIzhtcaezsc8OZ63au6ahSBQqg==
   dependencies:
-    apollo-server-types "0.2.0"
+    apollo-server-types "^0.2.4"
 
-apollo-server-types@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.0.tgz#270d7298f709fd8237ebfa48753249e5286df5f2"
-  integrity sha512-5dgiyXsM90vnfmdXO1ixHvsLn0d9NP4tWufmr3ZmjKv00r4JAQNUaUdgOSGbRIKoHELQGwxUuTySTZ/tYfGaNQ==
+apollo-server-types@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.4.tgz#28864900ffc7f9711a859297c143a833fdb6aa43"
+  integrity sha512-G4FvBVgGQcTW6ZBS2+hvcDQkSfdOIKV+cHADduXA275v+5zl42g+bCaGd/hCCKTDRjmQvObLiMxH/BJ6pDMQgA==
   dependencies:
-    apollo-engine-reporting-protobuf "0.4.0"
-    apollo-server-caching "0.5.0"
-    apollo-server-env "2.4.0"
+    apollo-engine-reporting-protobuf "^0.4.0"
+    apollo-server-caching "^0.5.0"
+    apollo-server-env "^2.4.3"
 
-apollo-tracing@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.0.tgz#28cd9c61a4db12b2c24dad67fdedd309806c1650"
-  integrity sha512-cNOtOlyZ56iJRsCjnxjM1V0SnQ2ZZttuyoeOejdat6llPfk5bfYTVOKMjdbSfDvU33LS9g9sqNJCT0MwrEPFKQ==
+apollo-tracing@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.4.tgz#0117820c3f0ad3aa6daf7bf13ddbb923cbefa6de"
+  integrity sha512-DjbFW0IvHicSlTVG+vK+1WINfBMRCdPPHJSW/j65JMir9Oe56WGeqL8qz8hptdUUmLYEb+azvcyyGsJsiR3zpQ==
   dependencies:
-    apollo-server-env "2.4.0"
-    graphql-extensions "0.8.0"
+    apollo-server-env "^2.4.3"
+    graphql-extensions "^0.10.3"
 
 apollo-upload-client@^9.1.0:
   version "9.1.0"
@@ -2068,11 +2101,6 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
-array-filter@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
-  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
-
 array-find@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz#6c8e286d11ed768327f8e62ecee87353ca3e78b8"
@@ -2096,16 +2124,6 @@ array-includes@^3.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
 
-array-map@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
-  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
-
-array-reduce@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
-  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
-
 array-union@^1.0.1, array-union@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -2178,9 +2196,9 @@ async-each@^1.0.1:
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async-retry@^1.2.1:
   version "1.2.3"
@@ -2219,17 +2237,17 @@ atob@^2.1.1:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.5.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
-  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
+  version "9.6.4"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.4.tgz#e6453be47af316b2923eaeaed87860f52ad4b7eb"
+  integrity sha512-Koz2cJU9dKOxG8P1f8uVaBntOv9lP4yz9ffWvWaicv9gHBPhpQB22nGijwd8gqW9CNT+UdkbQOQNLVI8jN1ZfQ==
   dependencies:
-    browserslist "^4.6.3"
-    caniuse-lite "^1.0.30000980"
+    browserslist "^4.7.0"
+    caniuse-lite "^1.0.30000998"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.17"
-    postcss-value-parser "^4.0.0"
+    postcss "^7.0.18"
+    postcss-value-parser "^4.0.2"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -2281,16 +2299,16 @@ babel-core@^6.0.0, babel-core@^6.26.0:
     source-map "^0.5.7"
 
 babel-eslint@^10.0.1:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.2.tgz#182d5ac204579ff0881684b040560fdcc1558456"
-  integrity sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q==
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
+  integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.0.0"
     "@babel/traverse" "^7.0.0"
     "@babel/types" "^7.0.0"
-    eslint-scope "3.7.1"
     eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"
 
 babel-extract-comments@^1.0.0:
   version "1.0.0"
@@ -3014,9 +3032,9 @@ balanced-match@^1.0.0:
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-js@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
 base@^0.11.1:
   version "0.11.2"
@@ -3079,9 +3097,9 @@ bluebird@3.5.0:
   integrity sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=
 
 bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.5:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
-  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.0.tgz#56a6a886e03f6ae577cffedeb524f8f2450293cf"
+  integrity sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -3172,7 +3190,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2:
+braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -3260,14 +3278,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.2, browserslist@^4.6.3:
-  version "4.6.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
-  integrity sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==
+browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.6, browserslist@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
+  integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==
   dependencies:
-    caniuse-lite "^1.0.30000984"
-    electron-to-chromium "^1.3.191"
-    node-releases "^1.1.25"
+    caniuse-lite "^1.0.30000989"
+    electron-to-chromium "^1.3.247"
+    node-releases "^1.1.29"
 
 bser@^2.0.0:
   version "2.1.0"
@@ -3346,16 +3364,17 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
-cacache@^11.3.2:
-  version "11.3.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"
-  integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
+cacache@^12.0.2:
+  version "12.0.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
+  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
   dependencies:
     bluebird "^3.5.5"
     chownr "^1.1.1"
     figgy-pudding "^3.5.1"
     glob "^7.1.4"
     graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
     lru-cache "^5.1.1"
     mississippi "^3.0.0"
     mkdirp "^0.5.1"
@@ -3468,10 +3487,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000984:
-  version "1.0.30000984"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz#dc96c3c469e9bcfc6ad5bdd24c77ec918ea76fe0"
-  integrity sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30000998:
+  version "1.0.30000999"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz#427253a69ad7bea4aa8d8345687b8eec51ca0e43"
+  integrity sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==
 
 capture-exit@^1.2.0:
   version "1.2.0"
@@ -3541,24 +3560,24 @@ check-types@^8.0.3:
   integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==
 
 "chokidar@>=2.0.0 <4.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681"
-  integrity sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==
-  dependencies:
-    anymatch "^3.0.1"
-    braces "^3.0.2"
-    glob-parent "^5.0.0"
-    is-binary-path "^2.1.0"
-    is-glob "^4.0.1"
-    normalize-path "^3.0.0"
-    readdirp "^3.1.1"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.1.tgz#4634772a1924512d990d4505957bf3a510611387"
+  integrity sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.1.3"
   optionalDependencies:
-    fsevents "^2.0.6"
+    fsevents "~2.1.0"
 
-chokidar@^2.0.2, chokidar@^2.1.5, chokidar@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
-  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
+chokidar@^2.0.2, chokidar@^2.1.5, chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -3575,11 +3594,11 @@ chokidar@^2.0.2, chokidar@^2.1.5, chokidar@^2.1.6:
     fsevents "^1.2.7"
 
 chownr@^1.0.1, chownr@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
-  integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
+  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
 
-chrome-trace-event@^1.0.0:
+chrome-trace-event@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
   integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
@@ -3710,15 +3729,14 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-clone-deep@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
   dependencies:
-    for-own "^1.0.0"
     is-plain-object "^2.0.4"
-    kind-of "^6.0.0"
-    shallow-clone "^1.0.0"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
 
 clone@2.x:
   version "2.1.2"
@@ -3791,9 +3809,9 @@ color@^3.0.0:
     color-string "^1.5.2"
 
 colors@^1.1.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
-  integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
@@ -3813,9 +3831,9 @@ commander@2.17.x:
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 commander@^2.14.1, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.9.0, commander@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.1.tgz#3863ce3ca92d0831dcf2a102f5fb4b5926afd0f9"
+  integrity sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==
 
 commander@~2.19.0:
   version "2.19.0"
@@ -3902,9 +3920,9 @@ configstore@^3.0.0:
     xdg-basedir "^3.0.0"
 
 confusing-browser-globals@^1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.7.tgz#5ae852bd541a910e7ffb2dbb864a2d21a36ad29b"
-  integrity sha512-cgHI1azax5ATrZ8rJ+ODDML9Fvu67PimB6aNxBrc/QwSaDaM9eTfIEUHx3bBLJJ82ioSb+/5zfsMCCEJax3ByQ==
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
+  integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==
 
 connect-history-api-fallback@^1.6.0:
   version "1.6.0"
@@ -4001,18 +4019,12 @@ copy-webpack-plugin@^4.6.0:
     serialize-javascript "^1.4.0"
 
 core-js-compat@^3.1.1:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz#e4d0c40fbd01e65b1d457980fe4112d4358a7408"
-  integrity sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.2.1.tgz#0cbdbc2e386e8e00d3b85dc81c848effec5b8150"
+  integrity sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==
   dependencies:
-    browserslist "^4.6.2"
-    core-js-pure "3.1.4"
-    semver "^6.1.1"
-
-core-js-pure@3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769"
-  integrity sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==
+    browserslist "^4.6.6"
+    semver "^6.3.0"
 
 core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.9"
@@ -4020,9 +4032,9 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 
 core-js@^3.0.1:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
-  integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09"
+  integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -4351,15 +4363,15 @@ current-script-polyfill@^1.0.0:
   resolved "https://registry.yarnpkg.com/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz#f31cf7e4f3e218b0726e738ca92a02d3488ef615"
   integrity sha1-8xz35PPiGLBybnOMqSoC00iO9hU=
 
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
 cypress@^3.2.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.4.0.tgz#8053ee107eb6309f26abd57e882d05578bdc3391"
-  integrity sha512-vUE+sK3l23fhs5qTN3dKpveyP0fGr37VmK3FSYaTEjbqC/qh4DbA1Ych/3bLStUpHP4rpE5KAx7i1s/tpdD9vQ==
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.4.1.tgz#ca2e4e9864679da686c6a6189603efd409664c30"
+  integrity sha512-1HBS7t9XXzkt6QHbwfirWYty8vzxNMawGj1yI+Fu6C3/VZJ8UtUngMW6layqwYZzLTZV8tiDpdCNBypn78V4Dg==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
     "@cypress/xvfb" "1.2.4"
@@ -4376,12 +4388,11 @@ cypress@^3.2.0:
     extract-zip "1.6.7"
     fs-extra "5.0.0"
     getos "3.1.1"
-    glob "7.1.3"
     is-ci "1.2.1"
     is-installed-globally "0.1.0"
     lazy-ass "1.6.0"
     listr "0.12.0"
-    lodash "4.17.11"
+    lodash "4.17.15"
     log-symbols "2.2.0"
     minimist "1.2.0"
     moment "2.24.0"
@@ -4438,7 +4449,7 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
+debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -4468,9 +4479,16 @@ dedent@^0.7.0:
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
 deep-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz#3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"
+  integrity sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==
+  dependencies:
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
 
 deep-extend@^0.6.0:
   version "0.6.0"
@@ -4501,12 +4519,11 @@ default-gateway@^4.2.0:
     ip-regex "^2.1.0"
 
 default-gateway@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-5.0.2.tgz#d2d8a13d6fee406d9365d19ec9adccb8a60b82b3"
-  integrity sha512-wXuT0q8T5vxQNecrTgz/KbU2lPUMRc98I9Y5dnH3yhFB3BGYqtADK4lhivLlG0OfjhmfKx1PGILG2jR4zjI+WA==
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-5.0.3.tgz#18434c9430a18035a2861f7839bf7669b3436e6f"
+  integrity sha512-zW+ld9xtN0+q48wIwhitUzhfERJN7BPgvijPhuCKG6bfWqnoqtSNSnrXfvAME2ZJLpgYpz6UorpBddGfLzrJBw==
   dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
+    execa "^2.0.3"
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
@@ -4714,23 +4731,28 @@ dom-event-types@^1.0.0:
   integrity sha512-2G2Vwi2zXTHBGqXHsJ4+ak/iP0N8Ar+G8a7LiD2oup5o4sQWytwqqrZu/O6hIMV0KMID2PL69OhpshLO0n7UJQ==
 
 dom-serializer@0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
-  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz#13650c850daffea35d8b626a4cfc4d3a17643fdb"
+  integrity sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==
   dependencies:
-    domelementtype "^1.3.0"
-    entities "^1.1.1"
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
 
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+domelementtype@1, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
+domelementtype@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
+  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -4762,9 +4784,9 @@ domutils@^1.5.1, domutils@^1.7.0:
     domelementtype "1"
 
 dot-object@^1.7.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/dot-object/-/dot-object-1.8.1.tgz#6d2e3412bbf1a078ffc88bf0afb9900be078758b"
-  integrity sha512-Tk/EzgutsRgX1agdapqO8GTLMVFC2wg2X3xJB76W+rEIlTplQksedM/MzYS+FmkE8llJ6nMR60mhhw9aaGGHGA==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/dot-object/-/dot-object-1.9.0.tgz#6e3d6d8379f794c5174599ddf05528f5990f076e"
+  integrity sha512-7MPN6y7XhAO4vM4eguj5+5HNKLjJYfkVG1ZR1Aput4Q4TR6SYeSjhpVQ77IzJHoSHffKbDxBC+48aCiiRurDPw==
   dependencies:
     commander "^2.20.0"
     glob "^7.1.4"
@@ -4840,14 +4862,14 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 ejs@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6"
-  integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.1.tgz#5b5ab57f718b79d4aca9254457afecd36fa80228"
+  integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==
 
-electron-to-chromium@^1.3.191:
-  version "1.3.194"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.194.tgz#a96452a96d4539131957aade9f634a45721f2819"
-  integrity sha512-w0LHR2YD9Ex1o+Sz4IN2hYzCB8vaFtMNW+yJcBf6SZlVqgFahkne/4rGVJdk4fPF98Gch9snY7PiabOh+vqHNg==
+electron-to-chromium@^1.3.247:
+  version "1.3.277"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.277.tgz#38b7b297f9b3f67ea900a965c1b11a555de526ec"
+  integrity sha512-Czmsrgng89DOgJlIknnw9bn5431QdtnUwGp5YYiPwU1DbZQUxCLF+rc1ZC09VNAdalOPcvH6AE8BaA0H5HjI/w==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -4855,9 +4877,9 @@ elegant-spinner@^1.0.1:
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
 elliptic@^6.0.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.0.tgz#2b8ed4c891b7de3200e14412a5b8248c7af505ca"
-  integrity sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"
+  integrity sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -4883,9 +4905,9 @@ encodeurl@~1.0.2:
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
@@ -4912,6 +4934,11 @@ entities@^1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
+entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
+  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -4927,23 +4954,27 @@ error-ex@^1.2.0, error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 error-stack-parser@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.2.tgz#4ae8dbaa2bf90a8b450707b9149dcabca135520d"
-  integrity sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.4.tgz#a757397dc5d9de973ac9a5d7d4e8ade7cfae9101"
+  integrity sha512-fZ0KkoxSjLFmhW5lHbUT3tLwy3nX1qEzMYo8koY1vrsAco53CMT1djnBSeC/wUjTEZRhZl9iRw7PaMaxfJ4wzQ==
   dependencies:
-    stackframe "^1.0.4"
+    stackframe "^1.1.0"
 
 es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.15.0.tgz#8884928ec7e40a79e3c9bc812d37d10c8b24cc57"
+  integrity sha512-bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==
   dependencies:
     es-to-primitive "^1.2.0"
     function-bind "^1.1.1"
     has "^1.0.3"
+    has-symbols "^1.0.0"
     is-callable "^1.1.4"
     is-regex "^1.0.4"
-    object-keys "^1.0.12"
+    object-inspect "^1.6.0"
+    object-keys "^1.1.1"
+    string.prototype.trimleft "^2.1.0"
+    string.prototype.trimright "^2.1.0"
 
 es-to-primitive@^1.2.0:
   version "1.2.0"
@@ -4965,9 +4996,9 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.9.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
-  integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
+  integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -5026,17 +5057,17 @@ eslint-loader@^2.1.2:
     rimraf "^2.6.1"
 
 eslint-module-utils@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
-  integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz#7b4675875bf96b0dbf1b21977456e5bb1f5e018c"
+  integrity sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==
   dependencies:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
 
 eslint-plugin-cypress@^2.2.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.6.0.tgz#c726dd1a312cd5234de94765ca79718a14edf0ef"
-  integrity sha512-/YmvhYFqjFLYw7llDl56U9KW+Z25TZJjDofT47aUnAFRRvOhj1y2nxJzZ1ZTnqBO1ja8gwRhtdT7LfTLg9ANJw==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.7.0.tgz#117f14ce63698e4c4f3afea3d7e27025c8d504f0"
+  integrity sha512-52Lq5ePCD/8jc536e1RqtLfj33BAy1s7BlYgCjbG39J5kqUitcTlRY5i3NRoeAyPHueDwETsq0eASF44ugLosQ==
   dependencies:
     globals "^11.12.0"
 
@@ -5049,9 +5080,9 @@ eslint-plugin-graphql@^2.1.1:
     lodash "^4.11.1"
 
 eslint-plugin-import@^2.17.3:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.1.tgz#2e4f571d13839543992ad626a18c0edffde9626b"
-  integrity sha512-YEESFKOcMIXJTosb5YaepqVhQHGMb8dxkgov560GqMDP/658U5vk6FeVSR7xXLeYkPc7xPYy+uAoiYE/bKMphA==
+  version "2.18.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"
+  integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==
   dependencies:
     array-includes "^3.0.3"
     contains-path "^0.1.0"
@@ -5079,14 +5110,6 @@ eslint-plugin-vue@^5.0.0:
   dependencies:
     vue-eslint-parser "^5.0.0"
 
-eslint-scope@3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
-  integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^3.7.1:
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
@@ -5104,16 +5127,16 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3:
     estraverse "^4.1.1"
 
 eslint-utils@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.0.tgz#e2c3c8dba768425f897cf0f9e51fe2e241485d4c"
-  integrity sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
+  integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
   dependencies:
     eslint-visitor-keys "^1.0.0"
 
 eslint-visitor-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
 eslint@^4.19.1:
   version "4.19.1"
@@ -5257,14 +5280,14 @@ esrecurse@^4.1.0:
     estraverse "^4.1.0"
 
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@~1.8.1:
   version "1.8.1"
@@ -5276,11 +5299,16 @@ event-pubsub@4.3.0:
   resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e"
   integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==
 
-eventemitter3@^3.0.0, eventemitter3@^3.1.0:
+eventemitter3@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
   integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
+eventemitter3@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+
 events@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
@@ -5360,6 +5388,21 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.5.tgz#5be3e2ea7e61bd038da5a0e11dc6ab2097357f2f"
+  integrity sha512-SwmwZZyJjflcqLSgllk4EQlMLst2p9muyzwNugKGFlpAz6rZ7M+s2nBR97GAq4Vzjwx2y9rcMcmqzojwN+xwNA==
+  dependencies:
+    cross-spawn "^6.0.5"
+    get-stream "^5.0.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^3.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 executable@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
@@ -5743,7 +5786,7 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
-find-cache-dir@^2.0.0:
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -5824,16 +5867,11 @@ fn-name@~2.0.1:
   integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
 
 follow-redirects@^1.0.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
-  integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f"
+  integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==
   dependencies:
-    debug "^3.2.6"
-
-for-in@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
+    debug "^3.0.0"
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
@@ -5847,13 +5885,6 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
-  dependencies:
-    for-in "^1.0.1"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -5926,11 +5957,11 @@ fs-extra@^7.0.1:
     universalify "^0.1.0"
 
 fs-minipass@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
-  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
   dependencies:
-    minipass "^2.2.1"
+    minipass "^2.6.0"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
@@ -5955,10 +5986,10 @@ fsevents@^1.2.3, fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
-fsevents@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
-  integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
+fsevents@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.0.tgz#ce1a5f9ac71c6d75278b0c5bd236d7dfece4cbaa"
+  integrity sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==
 
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
@@ -6004,9 +6035,9 @@ get-caller-file@^2.0.1:
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-own-enumerable-property-symbols@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
-  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.1.tgz#6f7764f88ea11e0b514bd9bd860a132259992ca4"
+  integrity sha512-09/VS4iek66Dh2bctjRkowueRJbY1JDGR1L/zRxO1Qk8Uxs6PnqaNSqalpizPT+CDjre3hnEsuzvhgomz9qYrA==
 
 get-stream@^3.0.0:
   version "3.0.0"
@@ -6020,6 +6051,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
+  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -6062,10 +6100,10 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
-  integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
+glob-parent@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
+  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
   dependencies:
     is-glob "^4.0.1"
 
@@ -6086,18 +6124,6 @@ glob@7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
@@ -6182,9 +6208,9 @@ got@^6.7.1:
     url-parse-lax "^1.0.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
+  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
 
 graphql-anywhere@^4.1.0-alpha.0:
   version "4.2.4"
@@ -6206,14 +6232,14 @@ graphql-config@^2.0.1:
     lodash "^4.17.4"
     minimatch "^3.0.4"
 
-graphql-extensions@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.8.0.tgz#b3fe7915aa84eef5a39135840840cc4d2e700c46"
-  integrity sha512-zV9RefkusIXqi9ZJtl7IJ5ecjDKdb7PLAb5E3CmxX3OK1GwNCIubp0vE7Fp4fXlCUKgTB1Woubs0zj71JT8o0A==
+graphql-extensions@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.10.3.tgz#9e37f3bd26309c40b03a0be0e63e02b3f99d52ea"
+  integrity sha512-kwU0gUe+Qdfr8iZYT91qrPSwQNgPhB/ClF1m1LEPdxlptk5FhFmjpxAcbMZ8q7j0kjfnbp2IeV1OhRDCEPqz2w==
   dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
-    apollo-server-env "2.4.0"
-    apollo-server-types "0.2.0"
+    "@apollographql/apollo-tools" "^0.4.0"
+    apollo-server-env "^2.4.3"
+    apollo-server-types "^0.2.4"
 
 graphql-import@^0.7.1:
   version "0.7.1"
@@ -6263,10 +6289,10 @@ graphql-upload@^8.0.2:
     http-errors "^1.7.2"
     object-path "^0.11.4"
 
-graphql@^14.0.2:
-  version "14.4.2"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.4.2.tgz#553a7d546d524663eda49ed6df77577be3203ae3"
-  integrity sha512-6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ==
+graphql@^14.0.2, graphql@^14.5.3:
+  version "14.5.8"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.5.8.tgz#504f3d3114cb9a0a3f359bbbcf38d9e5bf6a6b3c"
+  integrity sha512-MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg==
   dependencies:
     iterall "^1.2.2"
 
@@ -6294,9 +6320,9 @@ handle-thing@^2.0.0:
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.0.3:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
-  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.4.2.tgz#8810a9821a9d6d52cb2f57d326d6ce7c3dfe741d"
+  integrity sha512-cIv17+GhL8pHHnRJzGu2wwcthL5sb8uDKBHvZ2Dtu5s1YNt0ljbzKbamnc+gr69y7bzwQiBdr5+hOpRd5pnOdg==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -6419,9 +6445,9 @@ hex-color-regex@^1.1.0:
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 highlight.js@^9.6.0:
-  version "9.15.8"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz#f344fda123f36f1a65490e932cf90569e4999971"
-  integrity sha512-RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA==
+  version "9.15.10"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.10.tgz#7b18ed75c90348c045eef9ed08ca1319a2219ad2"
+  integrity sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -6451,9 +6477,9 @@ hoopy@^0.1.4:
   integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
 
 hosted-git-info@^2.1.4:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz#44119abaf4bc64692a16ace34700fed9c03e2546"
+  integrity sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -6577,7 +6603,7 @@ http-errors@~1.6.2:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
   integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
 
-http-proxy-middleware@^0.19.1:
+http-proxy-middleware@0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
   integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
@@ -6588,11 +6614,11 @@ http-proxy-middleware@^0.19.1:
     micromatch "^3.1.10"
 
 http-proxy@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
-  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
+  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
   dependencies:
-    eventemitter3 "^3.0.0"
+    eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
@@ -6645,9 +6671,9 @@ ignore-by-default@^1.0.1:
   integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk=
 
 ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.2.tgz#99d83a246c196ea5c93ef9315ad7b0819c35069b"
+  integrity sha512-EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw==
   dependencies:
     minimatch "^3.0.4"
 
@@ -6734,6 +6760,11 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
+infer-owner@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6783,9 +6814,9 @@ inquirer@^3.0.6:
     through "^2.3.6"
 
 inquirer@^6.2.2:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
-  integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -6821,11 +6852,6 @@ invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
-
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
@@ -6856,6 +6882,11 @@ is-absolute-url@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
   integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
+is-absolute-url@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
+  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
+
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -6870,6 +6901,11 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-arguments@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
+  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -6887,7 +6923,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-binary-path@^2.1.0:
+is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
   integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
@@ -6900,9 +6936,9 @@ is-buffer@^1.1.5, is-buffer@~1.1.1:
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-buffer@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
+  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
 is-callable@^1.1.4:
   version "1.1.4"
@@ -7042,7 +7078,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -7186,15 +7222,20 @@ is-resolvable@^1.0.0:
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
 is-retry-allowed@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
+  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
 
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
 is-svg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
@@ -7733,9 +7774,9 @@ joi@^11.1.1:
     topo "2.x.x"
 
 js-beautify@^1.6.12, js-beautify@^1.6.14:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.1.tgz#bdfe738ddbcaa12e4fced5af2d7cfad59f60ac0a"
-  integrity sha512-4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA==
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.2.tgz#88c9099cd6559402b124cfab18754936f8a7b178"
+  integrity sha512-ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==
   dependencies:
     config-chain "^1.1.12"
     editorconfig "^0.15.3"
@@ -7890,9 +7931,9 @@ json5@^1.0.1:
     minimist "^1.2.0"
 
 json5@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
-  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
+  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
   dependencies:
     minimist "^1.2.0"
 
@@ -7979,13 +8020,6 @@ lazy-ass@1.6.0:
   resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
   integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM=
 
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
-  dependencies:
-    invert-kv "^1.0.0"
-
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
@@ -8165,7 +8199,7 @@ loader-fs-cache@^1.0.0:
     find-cache-dir "^0.1.1"
     mkdirp "0.5.1"
 
-loader-runner@^2.3.0, loader-runner@^2.3.1:
+loader-runner@^2.3.1, loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
@@ -8250,11 +8284,6 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.tail@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
-  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
-
 lodash.template@^4.4.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
@@ -8280,12 +8309,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.11:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
-lodash@4.x, lodash@^4.11.1, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
+lodash@4.17.15, lodash@^4.11.1, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -8321,10 +8345,10 @@ log-update@^2.3.0:
     cli-cursor "^2.0.0"
     wrap-ansi "^3.0.1"
 
-loglevel@^1.6.3:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz#77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"
-  integrity sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==
+loglevel@^1.6.4:
+  version "1.6.4"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz#f408f4f006db8354d0577dcf6d33485b3cb90d56"
+  integrity sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==
 
 long@^4.0.0:
   version "4.0.0"
@@ -8390,6 +8414,11 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -8454,13 +8483,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 mem@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
@@ -8475,7 +8497,7 @@ memory-fs@^0.2.0:
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290"
   integrity sha1-8rslNovBIeORwlIN6Slpyu4KApA=
 
-memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -8502,10 +8524,15 @@ merge-stream@^1.0.1:
   dependencies:
     readable-stream "^2.0.1"
 
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
 merge2@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
-  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
 merge@^1.2.0:
   version "1.2.1"
@@ -8563,11 +8590,16 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.40.0, "mime-db@>= 1.40.0 < 2":
+mime-db@1.40.0:
   version "1.40.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
   integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
+"mime-db@>= 1.40.0 < 2":
+  version "1.42.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
+  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
+
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.24"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
@@ -8580,7 +8612,7 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.0.3, mime@^2.4.2:
+mime@^2.0.3, mime@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
   integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
@@ -8590,7 +8622,7 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.0.0:
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -8637,20 +8669,20 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
 minizlib@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
   dependencies:
-    minipass "^2.2.1"
+    minipass "^2.9.0"
 
 mississippi@^2.0.0:
   version "2.0.0"
@@ -8692,15 +8724,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mixin-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
-  dependencies:
-    for-in "^0.1.3"
-    is-extendable "^0.1.1"
-
-mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -8843,7 +8867,7 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0, neo-async@^2.6.0:
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
@@ -8861,12 +8885,12 @@ no-case@^2.2.0:
     lower-case "^1.1.1"
 
 node-cache@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-4.2.0.tgz#48ac796a874e762582692004a376d26dfa875811"
-  integrity sha512-obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-4.2.1.tgz#efd8474dee4edec4138cdded580f5516500f7334"
+  integrity sha512-BOb67bWg2dTyax5kdef5WfU3X8xu4wPg+zHzkvls0Q/QpYycIFRLEEIdAx9Wma43DxG6Qzn4illdZoYseKWa4A==
   dependencies:
     clone "2.x"
-    lodash "4.x"
+    lodash "^4.17.15"
 
 node-fetch@2.1.2:
   version "2.1.2"
@@ -8878,10 +8902,10 @@ node-fetch@^2.1.2, node-fetch@^2.2.0:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
-node-forge@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
-  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
+node-forge@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
+  integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
 
 node-int64@^0.4.0:
   version "0.4.0"
@@ -8897,7 +8921,7 @@ node-ipc@^9.1.1:
     js-message "1.0.5"
     js-queue "2.0.0"
 
-"node-libs-browser@^1.0.0 || ^2.0.0", node-libs-browser@^2.0.0:
+"node-libs-browser@^1.0.0 || ^2.0.0", node-libs-browser@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
   integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
@@ -8927,9 +8951,9 @@ node-ipc@^9.1.1:
     vm-browserify "^1.0.1"
 
 node-notifier@^5.2.1:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz#7b455fdce9f7de0c63538297354f3db468426e6a"
-  integrity sha512-SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
   dependencies:
     growly "^1.3.0"
     is-wsl "^1.1.0"
@@ -8953,17 +8977,17 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.25:
-  version "1.1.25"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz#0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3"
-  integrity sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==
+node-releases@^1.1.29:
+  version "1.1.34"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.34.tgz#ced4655ee1ba9c3a2c5dcbac385e19434155fd40"
+  integrity sha512-fNn12JTEfniTuCqo0r9jXgl44+KxRH/huV7zM/KAGOKxDKrHr6EbT7SSs4B+DNxyBE2mks28AD+Jw6PkfY5uwA==
   dependencies:
-    semver "^5.3.0"
+    semver "^6.3.0"
 
 nodemon@^1.18.6:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.1.tgz#576f0aad0f863aabf8c48517f6192ff987cd5071"
-  integrity sha512-/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg==
+  version "1.19.3"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.3.tgz#db71b3e62aef2a8e1283a9fa00164237356102c0"
+  integrity sha512-TBNKRmJykEbxpTniZBusqRrUTHIEqa2fpecbTQDQj1Gxjth7kKAPP296ztR0o5gPUWsiYbuEbt73/+XMYab1+w==
   dependencies:
     chokidar "^2.1.5"
     debug "^3.1.0"
@@ -9013,7 +9037,7 @@ normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -9064,6 +9088,13 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npm-run-path@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
+  dependencies:
+    path-key "^3.0.0"
+
 npm-which@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
@@ -9129,7 +9160,17 @@ object-hash@^1.1.4:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
-object-keys@^1.0.11, object-keys@^1.0.12:
+object-inspect@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
+
+object-is@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
+  integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -9235,6 +9276,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
 open@^6.3.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
@@ -9254,10 +9302,10 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optimism@^0.9.0:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.6.tgz#5621195486b294c3bfc518d17ac47767234b029f"
-  integrity sha512-bWr/ZP32UgFCQAoSkz33XctHwpq2via2sBvGvO5JIlrU8gaiM0LvoKj3QMle9LWdSKlzKik8XGSerzsdfYLNxA==
+optimism@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.3.tgz#163268fdc741dea2fb50f300bedda80356445fd7"
+  integrity sha512-9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw==
   dependencies:
     "@wry/context" "^0.4.0"
 
@@ -9320,16 +9368,7 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
-os-locale@^3.0.0:
+os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -9361,6 +9400,11 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
 p-is-promise@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
@@ -9374,9 +9418,9 @@ p-limit@^1.0.0, p-limit@^1.1.0:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
-  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
+  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
   dependencies:
     p-try "^2.0.0"
 
@@ -9437,11 +9481,11 @@ pako@~1.0.5:
   integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
 parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
   dependencies:
-    cyclist "~0.2.2"
+    cyclist "^1.0.1"
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
@@ -9460,9 +9504,9 @@ parent-module@^1.0.0:
     callsites "^3.0.0"
 
 parse-asn1@^5.0.0:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
-  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
+  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -9511,7 +9555,7 @@ parse5@4.0.0, parse5@^4.0.0:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
   integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@^1.3.2, parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@@ -9558,6 +9602,11 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
+path-key@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
+  integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
+
 path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -9673,9 +9722,9 @@ pkg-up@^2.0.0:
     find-up "^2.1.0"
 
 please-upgrade-node@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
-  integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
+  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
   dependencies:
     semver-compare "^1.0.0"
 
@@ -9689,10 +9738,10 @@ pn@^1.1.0:
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
   integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
-portfinder@^1.0.20:
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.21.tgz#60e1397b95ac170749db70034ece306b9a27e324"
-  integrity sha512-ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA==
+portfinder@^1.0.20, portfinder@^1.0.24:
+  version "1.0.24"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.24.tgz#11efbc6865f12f37624b6531ead1d809ed965cfa"
+  integrity sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -10023,10 +10072,10 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d"
-  integrity sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==
+postcss-value-parser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
+  integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
 
 postcss@^6.0.1, postcss@^6.0.23:
   version "6.0.23"
@@ -10037,10 +10086,10 @@ postcss@^6.0.1, postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.5:
-  version "7.0.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
-  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.18, postcss@^7.0.5:
+  version "7.0.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
+  integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -10187,9 +10236,9 @@ pseudomap@^1.0.2:
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24, psl@^1.1.28:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.2.0.tgz#df12b5b1b3a30f51c329eacbdef98f3a6e136dc6"
-  integrity sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2"
+  integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==
 
 pstree.remy@^1.1.6:
   version "1.1.7"
@@ -10416,10 +10465,10 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz#b158123ac343c8b0f31d65680269cc0fc1025db1"
-  integrity sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==
+readdirp@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.3.tgz#d6e011ed5b9240a92f08651eeb40f7942ceb6cc1"
+  integrity sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==
   dependencies:
     picomatch "^2.0.4"
 
@@ -10430,7 +10479,7 @@ realpath-native@^1.0.0:
   dependencies:
     util.promisify "^1.0.0"
 
-regenerate-unicode-properties@^8.0.2:
+regenerate-unicode-properties@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
   integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
@@ -10483,10 +10532,12 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp-tree@^0.1.6:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz#c9c7f00fcf722e0a56c7390983a7a63dd6c272f3"
-  integrity sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==
+regexp.prototype.flags@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
+  integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==
+  dependencies:
+    define-properties "^1.1.2"
 
 regexpp@^1.0.1:
   version "1.1.0"
@@ -10516,13 +10567,13 @@ regexpu-core@^2.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
-  integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
+regexpu-core@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
+  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.0.2"
+    regenerate-unicode-properties "^8.1.0"
     regjsgen "^0.5.0"
     regjsparser "^0.6.0"
     unicode-match-property-ecmascript "^1.0.4"
@@ -10724,10 +10775,10 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.10.0, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
-  integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
+resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
+  integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -10767,13 +10818,20 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@~2.6.2:
+rimraf@2.6.3, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -10821,9 +10879,9 @@ rxjs@^5.0.0-beta.11:
     symbol-observable "1.0.1"
 
 rxjs@^6.3.3, rxjs@^6.4.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
-  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
+  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
   dependencies:
     tslib "^1.9.0"
 
@@ -10832,7 +10890,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
@@ -10866,21 +10924,20 @@ sane@^2.0.0:
     fsevents "^1.2.3"
 
 sass-loader@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
-  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f"
+  integrity sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==
   dependencies:
-    clone-deep "^2.0.1"
+    clone-deep "^4.0.1"
     loader-utils "^1.0.1"
-    lodash.tail "^4.1.1"
     neo-async "^2.5.0"
-    pify "^3.0.0"
-    semver "^5.5.0"
+    pify "^4.0.1"
+    semver "^6.3.0"
 
 sass@^1.18.0:
-  version "1.22.7"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.7.tgz#5a1a77dc11aa659db4e782d238bf9f3d44a60546"
-  integrity sha512-ahREi0AdG7RTovSv14+yd1prQSfIvFcrDpOsth5EQf1+RM7SvOxsSttzNQaFmK1aa/k/3vyYwlYF5l0Xl+6c+g==
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.23.0.tgz#bd526ff40dbc5d09a4ed69e2cffa849749977710"
+  integrity sha512-W4HT8+WE31Rzk3EPQC++CXjD5O+lOxgYBIB8Ohvt7/zeE2UzYW+TOczDrRU3KcEy3+xwXXbmDsOZFkoqgD4TKw==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
@@ -10889,14 +10946,6 @@ sax@^1.2.4, sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-schema-utils@^0.4.4:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -10916,12 +10965,12 @@ selectboxit@^3.8.2:
   resolved "https://registry.yarnpkg.com/selectboxit/-/selectboxit-3.8.2.tgz#40ca2b11b97cea928cdf21542e9c57a142c71fae"
   integrity sha1-QMorEbl86pKM3yFULpxXoULHH64=
 
-selfsigned@^1.10.4:
-  version "1.10.4"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
-  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
+selfsigned@^1.10.7:
+  version "1.10.7"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"
+  integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==
   dependencies:
-    node-forge "0.7.5"
+    node-forge "0.9.0"
 
 semver-compare@^1.0.0:
   version "1.0.0"
@@ -10936,14 +10985,14 @@ semver-diff@^2.0.0:
     semver "^5.0.3"
 
 "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.1.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
-  integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
+semver@^6.0.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 send@0.17.1:
   version "0.17.1"
@@ -10965,9 +11014,14 @@ send@0.17.1:
     statuses "~1.5.0"
 
 serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
-  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
+  integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
+
+serialize-javascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
+  integrity sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==
 
 serve-index@^1.9.1:
   version "1.9.1"
@@ -11030,14 +11084,12 @@ sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
-  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
   dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^5.0.0"
-    mixin-object "^2.0.1"
+    kind-of "^6.0.2"
 
 shebang-command@^1.2.0:
   version "1.2.0"
@@ -11052,14 +11104,9 @@ shebang-regex@^1.0.0:
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shell-quote@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
-  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
-  dependencies:
-    array-filter "~0.0.0"
-    array-map "~0.0.0"
-    array-reduce "~0.0.0"
-    jsonify "~0.0.0"
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
+  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
 shellwords@^0.1.1:
   version "0.1.1"
@@ -11082,9 +11129,9 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-git@^1.85.0:
-  version "1.122.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.122.0.tgz#33b2d3a760aa02df470c79fbab5413d4f4e68945"
-  integrity sha512-plTwhnkIHrw2TFMJbJH/mKwWGgFbj03V9wcfBKa4FsuvgJbpwdlSJnlvkIQWDV1CVLaf2Gl6zSNeRRnxBRhX1g==
+  version "1.126.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.126.0.tgz#0c345372275139c8433b8277f4b3e155092aa434"
+  integrity sha512-47mqHxgZnN8XRa9HbpWprzUv3Ooqz9RY/LSZgvA7jCkW8jcwLahMz7LKugY91KZehfG0sCVPtgXiU72hd6b1Bw==
   dependencies:
     debug "^4.0.1"
 
@@ -11161,10 +11208,10 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sockjs-client@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
-  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
+sockjs-client@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
+  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
   dependencies:
     debug "^3.2.5"
     eventsource "^1.0.7"
@@ -11212,9 +11259,9 @@ source-map-support@^0.4.15:
     source-map "^0.5.6"
 
 source-map-support@^0.5.6, source-map-support@~0.5.12:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -11272,10 +11319,10 @@ spdy-transport@^3.0.0:
     readable-stream "^3.0.6"
     wbuf "^1.7.3"
 
-spdy@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
-  integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
+spdy@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"
+  integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==
   dependencies:
     debug "^4.1.0"
     handle-thing "^2.0.0"
@@ -11334,10 +11381,10 @@ stack-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
   integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
 
-stackframe@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
-  integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==
+stackframe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.1.0.tgz#e3fc2eb912259479c9822f7d1f1ff365bd5cbc83"
+  integrity sha512-Vx6W1Yvy+AM1R/ckVwcHQHV147pTPBKWCRLrXMuPrFVfvBUc3os7PR1QLIWCMhPpRg5eX9ojzbQIMLGBwyLjqg==
 
 staged-git-files@1.1.2:
   version "1.1.2"
@@ -11466,12 +11513,28 @@ string.prototype.padstart@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
+string.prototype.trimleft@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
+  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
+string.prototype.trimright@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
+  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
 string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
-  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
-    safe-buffer "~5.1.0"
+    safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
@@ -11535,6 +11598,11 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
@@ -11554,7 +11622,7 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-subscriptions-transport-ws@^0.9.11, subscriptions-transport-ws@^0.9.15:
+subscriptions-transport-ws@^0.9.11, subscriptions-transport-ws@^0.9.15, subscriptions-transport-ws@^0.9.16:
   version "0.9.16"
   resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz#90a422f0771d9c32069294c08608af2d47f596ec"
   integrity sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==
@@ -11638,9 +11706,9 @@ symbol-tree@^3.2.2:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 synchronous-promise@^2.0.6:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.9.tgz#b83db98e9e7ae826bf9c8261fd8ac859126c780a"
-  integrity sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.10.tgz#e64c6fd3afd25f423963353043f4a68ebd397fd8"
+  integrity sha512-6PC+JRGmNjiG3kJ56ZMNWDPL8hjyghF5cMXIFOKg+NiwwEZZIvxTWd0pinWKyD227odg9ygF8xVhhz7gb8Uq7A==
 
 table@4.0.2:
   version "4.0.2"
@@ -11655,9 +11723,9 @@ table@4.0.2:
     string-width "^2.1.1"
 
 table@^5.2.3:
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.4.tgz#6e0f88fdae3692793d1077fd172a4667afe986a6"
-  integrity sha512-IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg==
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
   dependencies:
     ajv "^6.10.2"
     lodash "^4.17.14"
@@ -11669,19 +11737,19 @@ tapable@^0.1.8:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
   integrity sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=
 
-tapable@^1.0.0, tapable@^1.1.0:
+tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^4:
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
-  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.5"
+    minipass "^2.8.6"
     minizlib "^1.2.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
@@ -11694,26 +11762,25 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4"
-  integrity sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==
+terser-webpack-plugin@^1.2.3, terser-webpack-plugin@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4"
+  integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==
   dependencies:
-    cacache "^11.3.2"
-    find-cache-dir "^2.0.0"
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
-    loader-utils "^1.2.3"
     schema-utils "^1.0.0"
     serialize-javascript "^1.7.0"
     source-map "^0.6.1"
-    terser "^4.0.0"
-    webpack-sources "^1.3.0"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.1.2.tgz#b2656c8a506f7ce805a3f300a2ff48db022fa391"
-  integrity sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==
+terser@^4.1.2:
+  version "4.3.8"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136"
+  integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -11750,9 +11817,9 @@ thenify-all@^1.0.0:
     any-promise "^1.0.0"
 
 thread-loader@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.2.tgz#f585dd38e852c7f9cded5d092992108148f5eb30"
-  integrity sha512-7xpuc9Ifg6WU+QYw/8uUqNdRwMD+N5gjwHKMqETrs96Qn+7BHwECpt2Brzr4HFlf4IAkZsayNhmGdbkBsTJ//w==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda"
+  integrity sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==
   dependencies:
     loader-runner "^2.3.1"
     loader-utils "^1.1.0"
@@ -11797,9 +11864,9 @@ timed-out@^4.0.0:
   integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
 timers-browserify@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
+  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
   dependencies:
     setimmediate "^1.0.4"
 
@@ -12137,9 +12204,9 @@ unzip-response@^2.0.1:
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
 upath@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
-  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 update-notifier@^2.5.0:
   version "2.5.0"
@@ -12249,9 +12316,9 @@ utils-merge@1.0.1:
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
+  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
@@ -12286,12 +12353,12 @@ vm-browserify@^1.0.1:
   integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
 
 vue-apollo@^3.0.0-beta.11:
-  version "3.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-rc.2.tgz#3b59a93084cb37c19be46b9f18cd63214a782718"
-  integrity sha512-bYgC3sK77rBlLEHi4XFFAm9NTTB10/onAUzUIhioKM8BKnnFOagjykqBtA9xFRVmFvOcgZBNNbgJhzScBeTn4Q==
+  version "3.0.0-rc.7"
+  resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-rc.7.tgz#4b603a9080acddf79d41d130609b5c66b7ded2eb"
+  integrity sha512-YbE4cVKuIOowhOVhMOLrvReELXZc1l7bKGNKQXYv3H1xRMYaz5U0KhXjgO16UCnYvygAG1jRKbkgSoHwaXmlDA==
   dependencies:
     chalk "^2.4.2"
-    serialize-javascript "^1.7.0"
+    serialize-javascript "^2.1.0"
     throttle-debounce "^2.1.0"
 
 vue-cli-plugin-apollo@^0.17.2:
@@ -12367,9 +12434,9 @@ vue-eslint-parser@^5.0.0:
     lodash "^4.17.11"
 
 vue-hot-reload-api@^2.3.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz#2756f46cb3258054c5f4723de8ae7e87302a1ccf"
-  integrity sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
+  integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
 vue-i18n-extract@^0.4.13:
   version "0.4.14"
@@ -12384,14 +12451,14 @@ vue-i18n-extract@^0.4.13:
     yargs "^13.2.2"
 
 vue-i18n@^8.0.0, vue-i18n@^8.4.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.12.0.tgz#25b56e9fab7e78a0ff58b8b4fba336ad328cce11"
-  integrity sha512-Wh40dvkYZH0CntkhQQEed7nY8P/8xOOHy5Bl9W/WmmmW0oLYIL66XWwOqlcnNbLaL5HGN7XISydYVqXS0Sst9w==
+  version "8.14.1"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.14.1.tgz#0ca0a2742c14e0144481655157fffcc7cc313e50"
+  integrity sha512-uHzw5GTFyf/TmjJXveSl3L4CG61KI4lvhKOQvx8W4Y8P2LZ3v3l/qw4KRs1C6pWyjkfY9p0rezYNFO5YzMEQ8A==
 
 vue-jest@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.4.tgz#b6a2b0d874968f26fa775ac901903fece531e08b"
-  integrity sha512-PY9Rwt4OyaVlA+KDJJ0614CbEvNOkffDI9g9moLQC/2DDoo0YrqZm7dHi13Q10uoK5Nt5WCYFdeAheOExPah0w==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.5.tgz#d6f124b542dcbff207bf9296c19413f4c40b70c9"
+  integrity sha512-xWDxde91pDqYBGDlODENZ3ezPgw+IQFoVDtf+5Awlg466w3KvMSqWzs8PxcTeTr+wmAHi0j+a+Lm3R7aUJa1jA==
   dependencies:
     babel-plugin-transform-es2015-modules-commonjs "^6.26.0"
     chalk "^2.1.0"
@@ -12436,9 +12503,9 @@ vue-product-zoomer@^2.0.11:
     vue "^2.5.2"
 
 vue-router@^3.0.3:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.7.tgz#b36ca107b4acb8ff5bc4ff824584059c23fcb87b"
-  integrity sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.3.tgz#e6b14fabc0c0ee9fda0e2cbbda74b350e28e412b"
+  integrity sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==
 
 vue-style-loader@^4.1.0:
   version "4.1.2"
@@ -12506,7 +12573,7 @@ watch@~0.18.0:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
-watchpack@^1.5.0:
+watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
   integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
@@ -12535,9 +12602,9 @@ webidl-conversions@^4.0.2:
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
 webpack-bundle-analyzer@^3.3.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz#3da733a900f515914e729fcebcd4c40dde71fc6f"
-  integrity sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz#ac02834f4b31de8e27d71e6c7a612301ebddb79f"
+  integrity sha512-g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A==
   dependencies:
     acorn "^6.0.7"
     acorn-walk "^6.1.1"
@@ -12548,7 +12615,7 @@ webpack-bundle-analyzer@^3.3.0:
     express "^4.16.3"
     filesize "^3.6.1"
     gzip-size "^5.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.15"
     mkdirp "^0.5.1"
     opener "^1.5.1"
     ws "^6.0.0"
@@ -12561,51 +12628,54 @@ webpack-chain@^4.11.0:
     deepmerge "^1.5.2"
     javascript-stringify "^1.6.0"
 
-webpack-dev-middleware@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
-  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
+webpack-dev-middleware@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
+  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
   dependencies:
     memory-fs "^0.4.1"
-    mime "^2.4.2"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
 webpack-dev-server@^3.4.1:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz#f79caa5974b7f8b63268ef5421222a8486d792f5"
-  integrity sha512-mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz#3292427bf6510da9a3ac2d500b924a4197667ff9"
+  integrity sha512-0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.1.6"
+    chokidar "^2.1.8"
     compression "^1.7.4"
     connect-history-api-fallback "^1.6.0"
     debug "^4.1.1"
     del "^4.1.1"
     express "^4.17.1"
     html-entities "^1.2.1"
-    http-proxy-middleware "^0.19.1"
+    http-proxy-middleware "0.19.1"
     import-local "^2.0.0"
     internal-ip "^4.3.0"
     ip "^1.1.5"
+    is-absolute-url "^3.0.3"
     killable "^1.0.1"
-    loglevel "^1.6.3"
+    loglevel "^1.6.4"
     opn "^5.5.0"
     p-retry "^3.0.1"
-    portfinder "^1.0.20"
+    portfinder "^1.0.24"
     schema-utils "^1.0.0"
-    selfsigned "^1.10.4"
-    semver "^6.1.1"
+    selfsigned "^1.10.7"
+    semver "^6.3.0"
     serve-index "^1.9.1"
     sockjs "0.3.19"
-    sockjs-client "1.3.0"
-    spdy "^4.0.0"
+    sockjs-client "1.4.0"
+    spdy "^4.0.1"
     strip-ansi "^3.0.1"
     supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.7.0"
+    webpack-dev-middleware "^3.7.2"
     webpack-log "^2.0.0"
+    ws "^6.2.1"
     yargs "12.0.5"
 
 webpack-log@^2.0.0:
@@ -12617,49 +12687,48 @@ webpack-log@^2.0.0:
     uuid "^3.3.2"
 
 webpack-merge@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
-  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
+  integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
   dependencies:
-    lodash "^4.17.5"
+    lodash "^4.17.15"
 
-webpack-sources@^1.1.0, webpack-sources@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
-  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-"webpack@>=4 < 4.29":
-  version "4.28.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
-  integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    acorn "^5.6.2"
-    acorn-dynamic-import "^3.0.0"
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chrome-trace-event "^1.0.0"
+webpack@^4.0.0:
+  version "4.41.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.0.tgz#db6a254bde671769f7c14e90a1a55e73602fc70b"
+  integrity sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
     enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.0"
+    eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    micromatch "^3.1.8"
-    mkdirp "~0.5.0"
-    neo-async "^2.5.0"
-    node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
-    tapable "^1.1.0"
-    terser-webpack-plugin "^1.1.0"
-    watchpack "^1.5.0"
-    webpack-sources "^1.3.0"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.1"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
 
 websocket-driver@>=0.5.1:
   version "0.7.3"
@@ -12945,7 +13014,7 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.0.0:
+ws@^6.0.0, ws@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
   integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
@@ -12988,9 +13057,9 @@ yallist@^2.1.2:
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
-  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yaml-loader@^0.5.0:
   version "0.5.0"
@@ -13041,15 +13110,15 @@ yargs@12.0.5:
     yargs-parser "^11.1.1"
 
 yargs@^11.0.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
-  integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
+  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.1.1"
     find-up "^2.1.0"
     get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
@@ -13116,10 +13185,10 @@ yup@^0.27.0:
     synchronous-promise "^2.0.6"
     toposort "^2.0.2"
 
-zen-observable-ts@^0.8.19:
-  version "0.8.19"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.19.tgz#c094cd20e83ddb02a11144a6e2a89706946b5694"
-  integrity sha512-u1a2rpE13G+jSzrg3aiCqXU5tN2kw41b+cBZGmnc+30YimdkKiDj9bTowcB41eL77/17RF/h+393AuVgShyheQ==
+zen-observable-ts@^0.8.20:
+  version "0.8.20"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz#44091e335d3fcbc97f6497e63e7f57d5b516b163"
+  integrity sha512-2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA==
   dependencies:
     tslib "^1.9.3"
     zen-observable "^0.8.0"

From 2eab933eb6c2b3144062af9057be672d9df2e1bd Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 7 Oct 2019 17:29:20 +0200
Subject: [PATCH 53/69] Fix taxes e2e test

---
 src/components/common/cartlike/CartLikePriceDetail.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/cartlike/CartLikePriceDetail.vue b/src/components/common/cartlike/CartLikePriceDetail.vue
index 2f63eb7e..d41c92cf 100644
--- a/src/components/common/cartlike/CartLikePriceDetail.vue
+++ b/src/components/common/cartlike/CartLikePriceDetail.vue
@@ -35,7 +35,8 @@
       <div class="col-sm-7">
         <span>{{ $t('salesTax') }}</span>
       </div>
-      <div class="col-sm-5 cart-taxes-amount">
+      <div data-test="cart-taxes-amount"
+           class="col-sm-5">
         <BaseMoney :money="taxes"/>
       </div>
     </div>

From b9bee96383ff523d1369cc442a6c14c3e5cbc0ad Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 7 Oct 2019 17:29:39 +0200
Subject: [PATCH 54/69] Test e2e for country selector

---
 tests/e2e/specs/locationSelector_spec.js | 15 +++++++++++----
 tests/e2e/support/commands.js            | 11 ++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/specs/locationSelector_spec.js b/tests/e2e/specs/locationSelector_spec.js
index f4ceb8b8..78c5b152 100644
--- a/tests/e2e/specs/locationSelector_spec.js
+++ b/tests/e2e/specs/locationSelector_spec.js
@@ -15,26 +15,33 @@ describe('Location selector', () => {
     cy.get('[data-test=stores-link]').should('contain', 'Stores');
   });
 
+  it('changes prices to selected country', () => {
+    cy.changeCountry('United States');
+    cy.get('[data-test=product-original-price]').contains(/^\s*US\$174.12\s*$/);
+    cy.changeCountry('Deutschland');
+    cy.get('[data-test=product-original-price]').contains(/^\s*174,12\s€\s*$/);
+  });
+
   it('opens and closes location selector', () => {
     cy.changeLanguage('Deutsch');
-    cy.get('span[data-test=location-selector-dropdown]')
+    cy.get('span[data-test=language-selector-dropdown]')
       .parent()
       .should('not.exist');
 
     cy.get('[data-test=location-selector-open-button]').click();
-    cy.get('span[data-test=location-selector-dropdown]')
+    cy.get('span[data-test=language-selector-dropdown]')
       .parent()
       .should('exist')
       .trigger('mouseleave')
       .should('not.exist');
 
     cy.get('[data-test=location-selector-open-button]').click();
-    cy.get('span[data-test=location-selector-dropdown]')
+    cy.get('span[data-test=language-selector-dropdown]')
       .parent()
       .should('exist');
 
     cy.get('[data-test=location-selector-open-button]').click();
-    cy.get('span[data-test=location-selector-dropdown]')
+    cy.get('span[data-test=language-selector-dropdown]')
       .parent()
       .should('not.exist');
   });
diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
index 3ceb5e57..fabed04a 100644
--- a/tests/e2e/support/commands.js
+++ b/tests/e2e/support/commands.js
@@ -49,13 +49,22 @@ Cypress.Commands.add('checkCustomerIsLoggedIn', (customer) => {
 
 Cypress.Commands.add('changeLanguage', (language) => {
   cy.get('[data-test=location-selector-open-button]').click();
-  cy.get('span[data-test=location-selector-dropdown]')
+  cy.get('span[data-test=language-selector-dropdown]')
     .click()
     .parent()
     .contains(language)
     .click();
 });
 
+Cypress.Commands.add('changeCountry', (country) => {
+  cy.get('[data-test=location-selector-open-button]').click();
+  cy.get('span[data-test=country-selector-dropdown]')
+    .click()
+    .parent()
+    .contains(country)
+    .click();
+});
+
 Cypress.Commands.add('createCustomer', draft => cy.wrap(clientPromise
   .then(client => mutation.deleteCustomer(client, draft.email)
     .then(() => mutation.createCustomer(client, draft)))));

From 85519ccdc0f046d9bff44e3bc31b16b94b4d0ad1 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 7 Oct 2019 17:54:59 +0200
Subject: [PATCH 55/69] Fix unit tests

---
 src/components/common/form/BaseLabel.vue            |  3 ++-
 .../CartLikeContentDetail.js}                       | 12 ++++++------
 .../{ => cartlike}/CartLikePriceDetail.spec.js      |  0
 .../specs/components/common/form/BaseInput.spec.js  | 11 -----------
 .../specs/components/common/form/BaseLabel.spec.js  | 13 ++++++++++++-
 5 files changed, 20 insertions(+), 19 deletions(-)
 rename tests/unit/specs/components/common/{form/CartLikeSummary.spec.js => cartlike/CartLikeContentDetail.js} (85%)
 rename tests/unit/specs/components/common/{ => cartlike}/CartLikePriceDetail.spec.js (100%)

diff --git a/src/components/common/form/BaseLabel.vue b/src/components/common/form/BaseLabel.vue
index 778ae986..8fd08fa4 100644
--- a/src/components/common/form/BaseLabel.vue
+++ b/src/components/common/form/BaseLabel.vue
@@ -2,7 +2,8 @@
   <span>
     <label v-if="label"
            class="field-label">
-      <span class="field-label-text">
+      <span class="field-label-text"
+            data-test="form-label-text">
         {{ label }}
         <span v-if="required"
               :title="$t('required')"
diff --git a/tests/unit/specs/components/common/form/CartLikeSummary.spec.js b/tests/unit/specs/components/common/cartlike/CartLikeContentDetail.js
similarity index 85%
rename from tests/unit/specs/components/common/form/CartLikeSummary.spec.js
rename to tests/unit/specs/components/common/cartlike/CartLikeContentDetail.js
index d9b1d74d..71c6fc78 100644
--- a/tests/unit/specs/components/common/form/CartLikeSummary.spec.js
+++ b/tests/unit/specs/components/common/cartlike/CartLikeContentDetail.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
-import CartLikeSummary from '@/components/common/cartlike/CartLikeSummary.vue';
+import CartLikeContentDetail from '@/components/common/cartlike/CartLikeContentDetail.vue';
 
-describe('CartLikeSummary.vue', () => {
+describe('CartLikeContentDetail.vue', () => {
   const cartLike = {
     lineItems: [],
     totalPrice: {
@@ -28,7 +28,7 @@ describe('CartLikeSummary.vue', () => {
   });
 
   it('renders a vue instance', () => {
-    expect(shallowMount(CartLikeSummary, options).isVueInstance()).toBeTruthy();
+    expect(shallowMount(CartLikeContentDetail, options).isVueInstance()).toBeTruthy();
   });
 
   it('transforms the totalPrice with a cart discount', () => {
@@ -47,7 +47,7 @@ describe('CartLikeSummary.vue', () => {
         fractionDigits: 2,
       },
     };
-    const wrapper = shallowMount(CartLikeSummary, options);
+    const wrapper = shallowMount(CartLikeContentDetail, options);
     expect(wrapper.vm.totalPrice(lineItem)).toEqual({
       discounted: {
         value: {
@@ -86,7 +86,7 @@ describe('CartLikeSummary.vue', () => {
         fractionDigits: 2,
       },
     };
-    const wrapper = shallowMount(CartLikeSummary, options);
+    const wrapper = shallowMount(CartLikeContentDetail, options);
     expect(wrapper.vm.totalPrice(lineItem)).toEqual({
       discounted: {
         value: {
@@ -118,7 +118,7 @@ describe('CartLikeSummary.vue', () => {
         fractionDigits: 2,
       },
     };
-    const wrapper = shallowMount(CartLikeSummary, options);
+    const wrapper = shallowMount(CartLikeContentDetail, options);
     expect(wrapper.vm.totalPrice(lineItem)).toEqual({
       value: {
         centAmount: 46250,
diff --git a/tests/unit/specs/components/common/CartLikePriceDetail.spec.js b/tests/unit/specs/components/common/cartlike/CartLikePriceDetail.spec.js
similarity index 100%
rename from tests/unit/specs/components/common/CartLikePriceDetail.spec.js
rename to tests/unit/specs/components/common/cartlike/CartLikePriceDetail.spec.js
diff --git a/tests/unit/specs/components/common/form/BaseInput.spec.js b/tests/unit/specs/components/common/form/BaseInput.spec.js
index 445c582f..cf2b7d9c 100644
--- a/tests/unit/specs/components/common/form/BaseInput.spec.js
+++ b/tests/unit/specs/components/common/form/BaseInput.spec.js
@@ -1,6 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
 import BaseInput from '@/components/common/form/BaseInput.vue';
-import BaseLabel from '@/components/common/form/BaseLabel.vue';
 
 describe('BaseInput.vue', () => {
   let options;
@@ -32,14 +31,4 @@ describe('BaseInput.vue', () => {
     wrapper.find('input').setValue('some val');
     expect(wrapper.emitted('input')[0]).toEqual(['some val']);
   });
-
-  it('nests input in label if it exists', () => {
-    const wrapper = shallowMount(BaseInput, options);
-    expect(wrapper.find(BaseLabel).exists()).toBeFalsy();
-    expect(wrapper.findAll('input').length).toBe(1);
-
-    wrapper.setProps({ label: 'Some label' });
-    expect(wrapper.find(BaseLabel).find('input').exists()).toBeTruthy();
-    expect(wrapper.findAll('input').length).toBe(1);
-  });
 });
diff --git a/tests/unit/specs/components/common/form/BaseLabel.spec.js b/tests/unit/specs/components/common/form/BaseLabel.spec.js
index d019d0cd..bfed4f4a 100644
--- a/tests/unit/specs/components/common/form/BaseLabel.spec.js
+++ b/tests/unit/specs/components/common/form/BaseLabel.spec.js
@@ -9,7 +9,6 @@ describe('BaseLabel.vue', () => {
       mocks: { $t: jest.fn() },
       propsData: {
         vuelidate: {},
-        label: 'Some Label',
       },
     };
   });
@@ -33,6 +32,18 @@ describe('BaseLabel.vue', () => {
       },
     });
     expect(wrapper.vm.required).toBeTruthy();
+    expect(wrapper.find('[data-test="form-label-required"]').exists()).toBeFalsy();
+
+    wrapper.setProps({ label: 'Some label' });
+    expect(wrapper.vm.required).toBeTruthy();
     expect(wrapper.find('[data-test="form-label-required"]').exists()).toBeTruthy();
   });
+
+  it('displays label text if it exists', () => {
+    const wrapper = shallowMount(BaseLabel, options);
+    expect(wrapper.find('[data-test="form-label-text"]').exists()).toBeFalsy();
+
+    wrapper.setProps({ label: 'Some label' });
+    expect(wrapper.find('[data-test="form-label-text"]').text()).toBe('Some label');
+  });
 });

From e3f1f22a6983febc9413d4d986c3dc3512409331 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 18 Oct 2019 19:49:39 +0200
Subject: [PATCH 56/69] Write e2e test for checkout, partly

---
 src/components/cartdetail/PageCartDetail.vue  |   3 +-
 src/components/checkout/BaseAddressForm.vue   |  30 +++--
 .../checkout/CheckoutNavigation.vue           |   3 +-
 .../checkout/StepBillingAddressForm.vue       |   3 +-
 .../checkout/StepPaymentMethodForm.vue        |   3 +-
 .../checkout/StepShippingMethodForm.vue       |  22 +++-
 tests/e2e/specs/checkoutPage_spec.js          | 109 ++++++++++++++++++
 7 files changed, 154 insertions(+), 19 deletions(-)
 create mode 100644 tests/e2e/specs/checkoutPage_spec.js

diff --git a/src/components/cartdetail/PageCartDetail.vue b/src/components/cartdetail/PageCartDetail.vue
index 7a6ce505..42478517 100644
--- a/src/components/cartdetail/PageCartDetail.vue
+++ b/src/components/cartdetail/PageCartDetail.vue
@@ -38,7 +38,8 @@
         <div class="col-sm-6">
           <div class="checkout-now checkout-now-bottom">
             <router-link :to="{ name: 'checkout'}"
-                         class="pull-right text-uppercase checkout-now-btn">
+                         class="pull-right text-uppercase checkout-now-btn"
+                         data-test="checkout-button">
               {{ $t('startCheckout') }}
             </router-link>
           </div>
diff --git a/src/components/checkout/BaseAddressForm.vue b/src/components/checkout/BaseAddressForm.vue
index e3a80ad0..83b17adc 100644
--- a/src/components/checkout/BaseAddressForm.vue
+++ b/src/components/checkout/BaseAddressForm.vue
@@ -17,47 +17,54 @@
                        :vuelidate="$v.form.firstName"
                        :label="$t('firstName')"
                        type="text"
-                       autocomplete="fname"/>
+                       autocomplete="fname"
+                       data-test="address-form-firstName"/>
           </div>
           <div class="col-sm-6">
             <BaseInput v-model="form.lastName"
                        :vuelidate="$v.form.lastName"
                        :label="$t('lastName')"
                        type="text"
-                       autocomplete="lname"/>
+                       autocomplete="lname"
+                       data-test="address-form-lastName"/>
           </div>
           <div class="col-sm-12">
             <BaseInput v-model="form.streetName"
                        :vuelidate="$v.form.streetName"
                        :label="$t('streetName')"
                        type="text"
-                       autocomplete="street-address"/>
+                       autocomplete="street-address"
+                       data-test="address-form-streetName"/>
           </div>
           <div class="col-sm-12">
             <BaseInput v-model="form.additionalStreetInfo"
                        :vuelidate="$v.form.additionalStreetInfo"
                        :label="$t('additionalStreetInfo')"
-                       type="text"/>
+                       type="text"
+                       data-test="address-form-additionalStreetInfo"/>
           </div>
           <div class="col-sm-3">
             <BaseInput v-model="form.postalCode"
                        :vuelidate="$v.form.postalCode"
                        :label="$t('postalCode')"
                        type="text"
-                       autocomplete="postal-code"/>
+                       autocomplete="postal-code"
+                       data-test="address-form-postalCode"/>
           </div>
           <div class="col-sm-4">
             <BaseInput v-model="form.city"
                        :vuelidate="$v.form.city"
                        :label="$t('city')"
                        type="text"
-                       autocomplete="address-level2"/>
+                       autocomplete="address-level2"
+                       data-test="address-form-city"/>
           </div>
           <div class="col-sm-5">
             <BaseSelect v-model="form.country"
                         :vuelidate="$v.form.country"
                         :label="$t('country')"
-                        :options="countries"/>
+                        :options="countries"
+                        data-test="address-form-country"/>
           </div>
         </div>
         <hr>
@@ -67,14 +74,16 @@
                        :vuelidate="$v.form.phone"
                        :label="$t('phone')"
                        type="text"
-                       autocomplete="tel"/>
+                       autocomplete="tel"
+                       data-test="address-form-phone"/>
           </div>
           <div class="col-sm-6">
             <BaseInput v-model="form.email"
                        :vuelidate="$v.form.email"
                        :label="$t('email')"
                        type="email"
-                       autocomplete="email"/>
+                       autocomplete="email"
+                       data-test="address-form-email"/>
           </div>
         </div>
       </slot>
@@ -134,6 +143,9 @@ export default {
       this.form = { ...contactInfo, ...address };
       delete this.form.__typename;
     }
+    if (!this.form.country) {
+      this.form = { ...this.form, country: this.countries[0].id };
+    }
   },
 
   validations: {
diff --git a/src/components/checkout/CheckoutNavigation.vue b/src/components/checkout/CheckoutNavigation.vue
index 8d68ae82..a43a2b5f 100644
--- a/src/components/checkout/CheckoutNavigation.vue
+++ b/src/components/checkout/CheckoutNavigation.vue
@@ -13,7 +13,8 @@
       <div>
         <LoadingButton :state="state"
                        id="shipping-continue-checkout-btn-xs"
-                       class="btn text-uppercase next-button">
+                       class="btn text-uppercase next-button"
+                       data-test="continue-checkout-button">
           {{ $t('continue') }}
         </LoadingButton>
       </div>
diff --git a/src/components/checkout/StepBillingAddressForm.vue b/src/components/checkout/StepBillingAddressForm.vue
index 7d89d10b..e91ea466 100644
--- a/src/components/checkout/StepBillingAddressForm.vue
+++ b/src/components/checkout/StepBillingAddressForm.vue
@@ -7,7 +7,8 @@
       <div class="col-sm-12">
         <BaseInput v-model="sameAddress"
                    :label="$t('sameAddress')"
-                   type="checkbox"/>
+                   type="checkbox"
+                   data-test="checkout-form-same-as-shipping"/>
       </div>
     </div>
     <BaseForm v-if="sameAddress"
diff --git a/src/components/checkout/StepPaymentMethodForm.vue b/src/components/checkout/StepPaymentMethodForm.vue
index acd86e17..2fde8861 100644
--- a/src/components/checkout/StepPaymentMethodForm.vue
+++ b/src/components/checkout/StepPaymentMethodForm.vue
@@ -11,7 +11,8 @@
           <ServerError :error="error"/>
         </div>
       </div>
-      <BaseLabel :vuelidate="$v.form.paymentMethod">
+      <BaseLabel :vuelidate="$v.form.paymentMethod"
+                 data-test="checkout-form-payment-methods">
         <BaseRadio v-model="form.paymentMethod"
                    value="card"
                    class="checkout-form-option">
diff --git a/src/components/checkout/StepShippingMethodForm.vue b/src/components/checkout/StepShippingMethodForm.vue
index 79018ad2..fb574a81 100644
--- a/src/components/checkout/StepShippingMethodForm.vue
+++ b/src/components/checkout/StepShippingMethodForm.vue
@@ -11,20 +11,25 @@
           <ServerError :error="error"/>
         </div>
       </div>
-      <BaseLabel :vuelidate="$v.form.shippingMethod">
+      <BaseLabel :vuelidate="$v.form.shippingMethod"
+                 data-test="checkout-form-shipping-methods">
         <BaseRadio v-for="shippingMethod in shippingMethodsByLocation"
                    v-model="form.shippingMethod"
                    :value="shippingMethod.id"
                    :key="shippingMethod.id"
                    class="checkout-form-option">
           <span class="option-name">
-            {{ shippingMethod.name }}
-            <span class="option-description">
+            <span data-test="checkout-form-shipping-method-name">
+              {{ shippingMethod.name }}
+            </span>
+            <span class="option-description"
+                  data-test="checkout-form-shipping-method-description">
               {{ shippingMethod.description }}
             </span>
           </span>
           <BaseMoney :money="price(shippingMethod)"
-                     class="option-price"/>
+                     class="option-price"
+                     data-test="checkout-form-shipping-method-price"/>
         </BaseRadio>
       </BaseLabel>
       <CheckoutNavigation :state="state"
@@ -70,9 +75,14 @@ export default {
     },
 
     matchingShippingRate(shippingMethod) {
+      return this.matchingZoneRate(shippingMethod).shippingRates
+        .find(shippingRate => shippingRate.isMatching);
+    },
+
+    matchingZoneRate(shippingMethod) {
       return shippingMethod.zoneRates
-        .map(zoneRate => zoneRate.shippingRates
-          .find(shippingRate => shippingRate.isMatching))[0];
+        .find(zoneRate => zoneRate.shippingRates
+          .some(shippingRate => shippingRate.isMatching));
     },
 
     isFree(shippingRate) {
diff --git a/tests/e2e/specs/checkoutPage_spec.js b/tests/e2e/specs/checkoutPage_spec.js
new file mode 100644
index 00000000..d5a897f2
--- /dev/null
+++ b/tests/e2e/specs/checkoutPage_spec.js
@@ -0,0 +1,109 @@
+describe('CheckoutPage', () => {
+  beforeEach(() => {
+    cy.visit('/');
+  });
+
+  it('displays content of cart', () => {
+    cy.addLineItem('/product/lemare-booties-0778-brown/M0E20000000E0XM', 2);
+    cy.addLineItem('/product/lemare-booties-0778-grey/M0E20000000E0WX', 3);
+    cy.visit('/cart');
+    cy.get('[data-test=checkout-button]').click();
+
+    cy.get('[data-test=address-form-firstName]').type('Charlie');
+    cy.get('[data-test=address-form-lastName]').type('Bucket');
+    cy.get('[data-test=address-form-streetName]').type('Nowhere str.');
+    cy.get('[data-test=address-form-additionalStreetInfo]').type('Crocked house');
+    cy.get('[data-test=address-form-postalCode]').type('54321');
+    cy.get('[data-test=address-form-city]').type('Little Town');
+    cy.get('[data-test=address-form-phone]').type('None');
+    cy.get('[data-test=address-form-email]').type('charlie.bucket@commercetools.com');
+
+    cy.get('[data-test=continue-checkout-button]').click();
+
+    cy.get('[data-test=checkout-form-same-as-shipping]').uncheck();
+
+    cy.get('[data-test=address-form-firstName]').type('Willy');
+    cy.get('[data-test=address-form-lastName]').type('Wonka');
+    cy.get('[data-test=address-form-streetName]').type('Cherry Street');
+    cy.get('[data-test=address-form-additionalStreetInfo]').type('Chocolate Factory');
+    cy.get('[data-test=address-form-postalCode]').type('12345');
+    cy.get('[data-test=address-form-city]').type('Little Town');
+    cy.get('[data-test=address-form-phone]').type('555-44-22-11');
+    cy.get('[data-test=address-form-email]').type('willy.wonka@commercetools.com');
+
+    cy.get('[data-test=continue-checkout-button]').click();
+
+    cy.get('[data-test=checkout-form-shipping-methods]')
+      .find('label')
+      .should('have.length', 2)
+      .eq(1)
+      .then(($method) => {
+        cy.wrap($method)
+          .find('[data-test=checkout-form-shipping-method-name]')
+          .contains(/^\s*Express EU\s*$/);
+
+        cy.wrap($method)
+          .find('[data-test=checkout-form-shipping-method-description]')
+          .contains(/^\s*Same day delivery\s*$/);
+
+        cy.wrap($method)
+          .find('[data-test=checkout-form-shipping-method-price]')
+          .contains(/\s10,00\s€\s/);
+
+        cy.wrap($method)
+          .find('input[type=radio]')
+          .check();
+      });
+
+    cy.get('[data-test=continue-checkout-button]').click();
+
+    cy.get('[data-test=checkout-form-payment-methods]')
+      .find('label')
+      .should('have.length', 2);
+
+    cy.get('[data-test=continue-checkout-button]').click();
+
+
+    // cy.get('[data-test=cart-total-items]')
+    //   .contains(/^\s*5 items in total\s*$/);
+    //
+    // cy.get('[data-test=cart-total-price]')
+    //   .contains(/^\s*815,90\s€\s*$/);
+    //
+    // cy.get('[data-test=cart-taxes-amount]')
+    //   .contains(/^\s*130,27\s€\s*$/);
+    //
+    // cy.get('[data-test=cart-subtotal-price]')
+    //   .contains(/^\s*815,90\s€\s*$/);
+    //
+    // cy.get('[data-test=cart-line-item]')
+    //   .should('have.length', 2)
+    //   .eq(1)
+    //   .then(($lineItem) => {
+    //     cy.wrap($lineItem)
+    //       .find('[data-test=cart-line-item-link]')
+    //       .should('have.attr', 'href', '/product/lemare-booties-0778-grey/M0E20000000E0WX')
+    //       .should('contain', 'Booties Lemare grey');
+    //
+    //     cy.wrap($lineItem)
+    //       .find('[data-test=cart-line-item-sku]')
+    //       .should('contain', 'M0E20000000E0WX');
+    //
+    //     cy.wrap($lineItem)
+    //       .find('[data-test=cart-line-item-quantity]')
+    //       .should('have.value', '3');
+    //
+    //     cy.wrap($lineItem)
+    //       .find('[data-test=price-old-value]')
+    //       .contains(/^\s*199,00\s€\s*$/);
+    //
+    //     cy.wrap($lineItem)
+    //       .find('[data-test=price-new-value]')
+    //       .contains(/^\s*139,30\s€\s*$/);
+    //
+    //     cy.wrap($lineItem)
+    //       .find('[data-test=cart-line-item-total-price]')
+    //       .contains(/^\s*417,90\s€\s*$/);
+    //   });
+  });
+});

From 1904245e809aa3fd7b462fed64416556261927fc Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Fri, 18 Oct 2019 20:10:58 +0200
Subject: [PATCH 57/69] Write unit tests for step shipping method form

---
 src/components/checkout/BaseAddressForm.vue   |  2 +-
 .../checkout/StepShippingMethodForm.vue       |  1 +
 .../checkout/StepShippingMethodForm.spec.js   | 60 +++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/specs/components/checkout/StepShippingMethodForm.spec.js

diff --git a/src/components/checkout/BaseAddressForm.vue b/src/components/checkout/BaseAddressForm.vue
index 83b17adc..60e3b8c5 100644
--- a/src/components/checkout/BaseAddressForm.vue
+++ b/src/components/checkout/BaseAddressForm.vue
@@ -144,7 +144,7 @@ export default {
       delete this.form.__typename;
     }
     if (!this.form.country) {
-      this.form = { ...this.form, country: this.countries[0].id };
+      this.form = { ...this.form, country: this.countries[0]?.id };
     }
   },
 
diff --git a/src/components/checkout/StepShippingMethodForm.vue b/src/components/checkout/StepShippingMethodForm.vue
index fb574a81..5692817a 100644
--- a/src/components/checkout/StepShippingMethodForm.vue
+++ b/src/components/checkout/StepShippingMethodForm.vue
@@ -63,6 +63,7 @@ export default {
   mixins: [cartMixin],
 
   data: () => ({
+    me: null,
     form: {
       shippingMethod: null,
     },
diff --git a/tests/unit/specs/components/checkout/StepShippingMethodForm.spec.js b/tests/unit/specs/components/checkout/StepShippingMethodForm.spec.js
new file mode 100644
index 00000000..10f427f3
--- /dev/null
+++ b/tests/unit/specs/components/checkout/StepShippingMethodForm.spec.js
@@ -0,0 +1,60 @@
+import Vuelidate from 'vuelidate';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import StepShippingMethodForm from '@/components/checkout/StepShippingMethodForm.vue';
+
+const localVue = createLocalVue();
+localVue.use(Vuelidate);
+
+describe('StepShippingMethodForm.vue', () => {
+  let options;
+
+  beforeEach(() => {
+    options = {
+      localVue,
+      mocks: { $t: jest.fn() },
+    };
+  });
+
+  it('renders a vue instance', () => {
+    expect(shallowMount(StepShippingMethodForm, options).isVueInstance()).toBeTruthy();
+  });
+
+  it('finds the matching shipping rate', () => {
+    const shippingMethod = {
+      zoneRates: [
+        {
+          shippingRates: [
+            { id: 1, isMatching: false },
+            { id: 2, isMatching: false },
+          ],
+        },
+        {
+          shippingRates: [
+            { id: 3, isMatching: false },
+            { id: 4, isMatching: true },
+            { id: 5, isMatching: true },
+          ],
+        },
+      ],
+    };
+    const wrapper = shallowMount(StepShippingMethodForm, options);
+    expect(wrapper.vm.matchingShippingRate(shippingMethod).id).toBe(4);
+  });
+
+  it('finds whether shipping rate is free', () => {
+    const wrapper = shallowMount(StepShippingMethodForm, options);
+    wrapper.setData({
+      me: {
+        activeCart: {
+          totalPrice: {
+            centAmount: 999,
+          },
+        },
+      },
+    });
+    expect(wrapper.vm.isFree({ freeAbove: { centAmount: 1000 } })).toBeFalsy();
+    expect(wrapper.vm.isFree({ freeAbove: { centAmount: 999 } })).toBeFalsy();
+    expect(wrapper.vm.isFree({ freeAbove: { centAmount: 998 } })).toBeTruthy();
+    expect(wrapper.vm.isFree({ })).toBeFalsy();
+  });
+});

From 7696626b50f50aad61b897bcff833b1c5eb681ac Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 4 Nov 2019 14:21:59 +0100
Subject: [PATCH 58/69] Revert printing error on console, find better solution

---
 src/components/common/form/ServerError.vue | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/components/common/form/ServerError.vue b/src/components/common/form/ServerError.vue
index f345626e..3ee7b0a4 100644
--- a/src/components/common/form/ServerError.vue
+++ b/src/components/common/form/ServerError.vue
@@ -38,20 +38,14 @@ export default {
       return this.isGraphQLError ? this.error.graphQLErrors : [];
     },
   },
-
-  watch: {
-    error(value) {
-      if (value && !this.isGraphQLError) console.error(value);
-    },
-  },
 };
 </script>
 
 <style scoped>
-.server-error {
-  color: rgb(206, 65, 65);
-  font-weight: bold;
-}
+  .server-error {
+    color: rgb(206, 65, 65);
+    font-weight: bold;
+  }
 </style>
 
 <i18n>

From c6aeba8d088a1e71ef316ed7194a7d080f889cdc Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 4 Nov 2019 16:54:25 +0100
Subject: [PATCH 59/69] Fix file name for test

---
 .../{CartLikeContentDetail.js => CartLikeContentDetail.spec.js}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/unit/specs/components/common/cartlike/{CartLikeContentDetail.js => CartLikeContentDetail.spec.js} (100%)

diff --git a/tests/unit/specs/components/common/cartlike/CartLikeContentDetail.js b/tests/unit/specs/components/common/cartlike/CartLikeContentDetail.spec.js
similarity index 100%
rename from tests/unit/specs/components/common/cartlike/CartLikeContentDetail.js
rename to tests/unit/specs/components/common/cartlike/CartLikeContentDetail.spec.js

From 0d09ed967959b7aa438c090061782fd26c3c28fb Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 4 Nov 2019 18:04:05 +0100
Subject: [PATCH 60/69] Complete e2e test for checkout

---
 .../checkout/StepPlaceOrderForm.vue           |   6 +-
 src/components/common/BaseAddress.vue         |  16 +--
 .../common/cartlike/CartLikeSummary.vue       |  12 +-
 tests/e2e/specs/checkoutPage_spec.js          | 133 ++++++++++++------
 4 files changed, 111 insertions(+), 56 deletions(-)

diff --git a/src/components/checkout/StepPlaceOrderForm.vue b/src/components/checkout/StepPlaceOrderForm.vue
index cd831b1e..d7ebaaff 100644
--- a/src/components/checkout/StepPlaceOrderForm.vue
+++ b/src/components/checkout/StepPlaceOrderForm.vue
@@ -2,7 +2,8 @@
   <div>
     <div v-if="order">
       <div class="row thank-you">
-        <div class="col-sm-12">
+        <div class="col-sm-12"
+             data-test="checkout-form-success">
           {{ $t('thankYou') }}
         </div>
       </div>
@@ -27,7 +28,8 @@
                        :editable="true" />
       <div class="complete-order">
         <LoadingButton :state="state"
-                       class="complete-order-btn">
+                       class="complete-order-btn"
+                       data-test="checkout-form-submit">
           {{ $t('completeMyOrder') }}
         </LoadingButton>
       </div>
diff --git a/src/components/common/BaseAddress.vue b/src/components/common/BaseAddress.vue
index a0864a46..8a98433f 100644
--- a/src/components/common/BaseAddress.vue
+++ b/src/components/common/BaseAddress.vue
@@ -1,16 +1,14 @@
 <template>
   <div>
-    <div>
-      {{ address.title }}
-      {{ address.firstName }}
-      {{ address.lastName }}
+    <div data-test="address-name">
+      {{ address.title }} {{ address.firstName }} {{ address.lastName }}
     </div>
-    <div>{{ address.streetName }} {{ address.streetNumber }}</div>
-    <div>{{ address.additionalStreetInfo }}</div>
-    <div>{{ address.postalCode }}, {{ address.city }} ({{ address.country }})</div>
+    <div data-test="address-street">{{ address.streetName }} {{ address.streetNumber }}</div>
+    <div data-test="address-street-info">{{ address.additionalStreetInfo }}</div>
+    <div data-test="address-city">{{ address.postalCode }}, {{ address.city }} ({{ address.country }})</div>
     <br>
-    <div>{{ address.contactInfo.phone }}</div>
-    <div>{{ address.contactInfo.email }}</div>
+    <div data-test="address-phone">{{ address.contactInfo.phone }}</div>
+    <div data-test="address-email">{{ address.contactInfo.email }}</div>
   </div>
 </template>
 
diff --git a/src/components/common/cartlike/CartLikeSummary.vue b/src/components/common/cartlike/CartLikeSummary.vue
index 9ad685e3..f5e3f89a 100644
--- a/src/components/common/cartlike/CartLikeSummary.vue
+++ b/src/components/common/cartlike/CartLikeSummary.vue
@@ -12,7 +12,8 @@
               {{ $t('edit') }}
             </router-link>
           </div>
-          <BaseAddress :address="shippingAddress"/>
+          <BaseAddress :address="shippingAddress"
+                       data-test="summary-shipping-address"/>
         </div>
       </div>
       <div class="col-sm-6">
@@ -26,7 +27,8 @@
               {{ $t('edit') }}
             </router-link>
           </div>
-          <BaseAddress :address="billingAddress"/>
+          <BaseAddress :address="billingAddress"
+                       data-test="summary-billing-address"/>
         </div>
       </div>
     </div>
@@ -42,7 +44,8 @@
               {{ $t('edit') }}
             </router-link>
           </div>
-          <div v-if="shippingMethod">
+          <div v-if="shippingMethod"
+               data-test="summary-shipping-method">
             {{ shippingMethod.name }}
             <span v-if="shippingMethod.description">- {{ shippingMethod.description }}</span>
           </div>
@@ -59,7 +62,8 @@
               {{ $t('edit') }}
             </router-link>
           </div>
-          <div v-if="payments">
+          <div v-if="payments"
+               data-test="summary-payment-method">
             <span v-for="payment in payments"
                   :key="payment.id">
               {{ payment.paymentMethodInfo.method }}
diff --git a/tests/e2e/specs/checkoutPage_spec.js b/tests/e2e/specs/checkoutPage_spec.js
index d5a897f2..402a7a4c 100644
--- a/tests/e2e/specs/checkoutPage_spec.js
+++ b/tests/e2e/specs/checkoutPage_spec.js
@@ -3,6 +3,94 @@ describe('CheckoutPage', () => {
     cy.visit('/');
   });
 
+  function shouldShowCorrectCartLike() {
+    cy.get('[data-test=summary-shipping-address]')
+      .then(($address) => {
+        cy.wrap($address)
+          .find('[data-test=address-name]')
+          .should('contain', 'Charlie Bucket');
+        cy.wrap($address)
+          .find('[data-test=address-street]')
+          .should('contain', 'Nowhere str.');
+        cy.wrap($address)
+          .find('[data-test=address-street-info]')
+          .should('contain', 'Crocked house');
+        cy.wrap($address)
+          .find('[data-test=address-city]')
+          .should('contain', '54321, Little Town (DE)');
+        cy.wrap($address)
+          .find('[data-test=address-phone]')
+          .should('contain', 'None');
+        cy.wrap($address)
+          .find('[data-test=address-email]')
+          .should('contain', 'charlie.bucket@commercetools.com');
+      });
+
+    cy.get('[data-test=summary-billing-address]')
+      .then(($address) => {
+        cy.wrap($address)
+          .find('[data-test=address-name]')
+          .should('contain', 'Willy Wonka');
+        cy.wrap($address)
+          .find('[data-test=address-street]')
+          .should('contain', 'Cherry Street');
+        cy.wrap($address)
+          .find('[data-test=address-street-info]')
+          .should('contain', 'Chocolate Factory');
+        cy.wrap($address)
+          .find('[data-test=address-city]')
+          .should('contain', '12345, Little Town (DE)');
+        cy.wrap($address)
+          .find('[data-test=address-phone]')
+          .should('contain', '555-44-22-11');
+        cy.wrap($address)
+          .find('[data-test=address-email]')
+          .should('contain', 'willy.wonka@commercetools.com');
+      });
+
+    cy.get('[data-test=summary-shipping-method]')
+      .should('contain', 'Express EU');
+
+    cy.get('[data-test=cart-subtotal-price]')
+      .contains(/^\s*815,90\s€\s*$/);
+    cy.get('[data-test=cart-shipping-price]')
+      .contains(/^\s*10,00\s€\s*$/);
+    cy.get('[data-test=cart-taxes-amount]')
+      .contains(/^\s*131,87\s€\s*$/);
+    cy.get('[data-test=cart-total-price]')
+      .contains(/^\s*825,90\s€\s*$/);
+
+    cy.get('[data-test=cart-line-item]')
+      .should('have.length', 2)
+      .eq(1)
+      .then(($lineItem) => {
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-link]')
+          .should('have.attr', 'href', '/product/lemare-booties-0778-grey/M0E20000000E0WX')
+          .should('contain', 'Booties Lemare grey');
+
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-sku]')
+          .should('contain', 'M0E20000000E0WX');
+
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-quantity]')
+          .should('contain', '3');
+
+        cy.wrap($lineItem)
+          .find('[data-test=price-old-value]')
+          .contains(/^\s*199,00\s€\s*$/);
+
+        cy.wrap($lineItem)
+          .find('[data-test=price-new-value]')
+          .contains(/^\s*139,30\s€\s*$/);
+
+        cy.wrap($lineItem)
+          .find('[data-test=cart-line-item-total-price]')
+          .contains(/^\s*417,90\s€\s*$/);
+      });
+  }
+
   it('displays content of cart', () => {
     cy.addLineItem('/product/lemare-booties-0778-brown/M0E20000000E0XM', 2);
     cy.addLineItem('/product/lemare-booties-0778-grey/M0E20000000E0WX', 3);
@@ -62,48 +150,11 @@ describe('CheckoutPage', () => {
       .should('have.length', 2);
 
     cy.get('[data-test=continue-checkout-button]').click();
+    shouldShowCorrectCartLike();
 
+    cy.get('[data-test=checkout-form-submit]').click();
 
-    // cy.get('[data-test=cart-total-items]')
-    //   .contains(/^\s*5 items in total\s*$/);
-    //
-    // cy.get('[data-test=cart-total-price]')
-    //   .contains(/^\s*815,90\s€\s*$/);
-    //
-    // cy.get('[data-test=cart-taxes-amount]')
-    //   .contains(/^\s*130,27\s€\s*$/);
-    //
-    // cy.get('[data-test=cart-subtotal-price]')
-    //   .contains(/^\s*815,90\s€\s*$/);
-    //
-    // cy.get('[data-test=cart-line-item]')
-    //   .should('have.length', 2)
-    //   .eq(1)
-    //   .then(($lineItem) => {
-    //     cy.wrap($lineItem)
-    //       .find('[data-test=cart-line-item-link]')
-    //       .should('have.attr', 'href', '/product/lemare-booties-0778-grey/M0E20000000E0WX')
-    //       .should('contain', 'Booties Lemare grey');
-    //
-    //     cy.wrap($lineItem)
-    //       .find('[data-test=cart-line-item-sku]')
-    //       .should('contain', 'M0E20000000E0WX');
-    //
-    //     cy.wrap($lineItem)
-    //       .find('[data-test=cart-line-item-quantity]')
-    //       .should('have.value', '3');
-    //
-    //     cy.wrap($lineItem)
-    //       .find('[data-test=price-old-value]')
-    //       .contains(/^\s*199,00\s€\s*$/);
-    //
-    //     cy.wrap($lineItem)
-    //       .find('[data-test=price-new-value]')
-    //       .contains(/^\s*139,30\s€\s*$/);
-    //
-    //     cy.wrap($lineItem)
-    //       .find('[data-test=cart-line-item-total-price]')
-    //       .contains(/^\s*417,90\s€\s*$/);
-    //   });
+    cy.get('[data-test=checkout-form-success]').should('exist');
+    shouldShowCorrectCartLike();
   });
 });

From 8c7d8f99bbcc4702c42cba855e23ae6339579f06 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 4 Nov 2019 18:23:14 +0100
Subject: [PATCH 61/69] Test case in which billing address is same as shipping

---
 .../checkout/CheckoutNavigation.vue           |  3 +-
 .../common/cartlike/CartLikeSummary.vue       | 12 ++--
 tests/e2e/specs/checkoutPage_spec.js          | 61 +++++++++++++++----
 3 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/src/components/checkout/CheckoutNavigation.vue b/src/components/checkout/CheckoutNavigation.vue
index a43a2b5f..90ff1fb2 100644
--- a/src/components/checkout/CheckoutNavigation.vue
+++ b/src/components/checkout/CheckoutNavigation.vue
@@ -4,7 +4,8 @@
       <div>
         <button @click="goBack"
                 type="button"
-                class="btn-grey text-uppercase back-button">
+                class="btn-grey text-uppercase back-button"
+                data-test="back-checkout-button">
           {{ $t('back') }}
         </button>
       </div>
diff --git a/src/components/common/cartlike/CartLikeSummary.vue b/src/components/common/cartlike/CartLikeSummary.vue
index f5e3f89a..ec7204d6 100644
--- a/src/components/common/cartlike/CartLikeSummary.vue
+++ b/src/components/common/cartlike/CartLikeSummary.vue
@@ -7,7 +7,8 @@
             {{ $t('shippingAddress') }}
             <router-link v-if="editable"
                          :to="{ name: 'checkout' }"
-                         class="checkout-summary-edit-icon pull-right">
+                         class="checkout-summary-edit-icon pull-right"
+                         data-test="summary-shipping-address-edit">
               <img src="../../../assets/img/edit-1.png" class="checkout-summary-edit-icon"/>
               {{ $t('edit') }}
             </router-link>
@@ -22,7 +23,8 @@
             {{ $t('billingAddress') }}
             <router-link v-if="editable"
                          :to="{ name: 'checkout-billing-address' }"
-                         class="checkout-summary-edit-icon pull-right">
+                         class="checkout-summary-edit-icon pull-right"
+                         data-test="summary-billing-address-edit">
               <img src="../../../assets/img/edit-1.png" class="checkout-summary-edit-icon"/>
               {{ $t('edit') }}
             </router-link>
@@ -39,7 +41,8 @@
             {{ $t('shippingMethod') }}
             <router-link v-if="editable"
                          :to="{ name: 'checkout-shipping-method' }"
-                         class="checkout-summary-edit-icon pull-right">
+                         class="checkout-summary-edit-icon pull-right"
+                         data-test="summary-shipping-method-edit">
               <img src="../../../assets/img/edit-1.png" class="checkout-summary-edit-icon"/>
               {{ $t('edit') }}
             </router-link>
@@ -57,7 +60,8 @@
             {{ $t('paymentDetails') }}
             <router-link v-if="editable"
                          :to="{ name: 'checkout-payment-method' }"
-                         class="checkout-summary-edit-icon pull-right">
+                         class="checkout-summary-edit-icon pull-right"
+                         data-test="summary-payment-method-edit">
               <img src="../../../assets/img/edit-1.png" class="checkout-summary-edit-icon"/>
               {{ $t('edit') }}
             </router-link>
diff --git a/tests/e2e/specs/checkoutPage_spec.js b/tests/e2e/specs/checkoutPage_spec.js
index 402a7a4c..39f60728 100644
--- a/tests/e2e/specs/checkoutPage_spec.js
+++ b/tests/e2e/specs/checkoutPage_spec.js
@@ -91,7 +91,7 @@ describe('CheckoutPage', () => {
       });
   }
 
-  it('displays content of cart', () => {
+  it('allows to place an order', () => {
     cy.addLineItem('/product/lemare-booties-0778-brown/M0E20000000E0XM', 2);
     cy.addLineItem('/product/lemare-booties-0778-grey/M0E20000000E0WX', 3);
     cy.visit('/cart');
@@ -107,20 +107,9 @@ describe('CheckoutPage', () => {
     cy.get('[data-test=address-form-email]').type('charlie.bucket@commercetools.com');
 
     cy.get('[data-test=continue-checkout-button]').click();
-
-    cy.get('[data-test=checkout-form-same-as-shipping]').uncheck();
-
-    cy.get('[data-test=address-form-firstName]').type('Willy');
-    cy.get('[data-test=address-form-lastName]').type('Wonka');
-    cy.get('[data-test=address-form-streetName]').type('Cherry Street');
-    cy.get('[data-test=address-form-additionalStreetInfo]').type('Chocolate Factory');
-    cy.get('[data-test=address-form-postalCode]').type('12345');
-    cy.get('[data-test=address-form-city]').type('Little Town');
-    cy.get('[data-test=address-form-phone]').type('555-44-22-11');
-    cy.get('[data-test=address-form-email]').type('willy.wonka@commercetools.com');
+    cy.get('[data-test=checkout-form-same-as-shipping]').should('exist');
 
     cy.get('[data-test=continue-checkout-button]').click();
-
     cy.get('[data-test=checkout-form-shipping-methods]')
       .find('label')
       .should('have.length', 2)
@@ -143,6 +132,52 @@ describe('CheckoutPage', () => {
           .check();
       });
 
+    cy.get('[data-test=continue-checkout-button]').click();
+    cy.get('[data-test=checkout-form-payment-methods]')
+      .find('label')
+      .should('have.length', 2);
+
+    cy.get('[data-test=continue-checkout-button]').click();
+    cy.get('[data-test=summary-billing-address]')
+      .then(($address) => {
+        cy.wrap($address)
+          .find('[data-test=address-name]')
+          .should('contain', 'Charlie Bucket');
+        cy.wrap($address)
+          .find('[data-test=address-street]')
+          .should('contain', 'Nowhere str.');
+        cy.wrap($address)
+          .find('[data-test=address-street-info]')
+          .should('contain', 'Crocked house');
+        cy.wrap($address)
+          .find('[data-test=address-city]')
+          .should('contain', '54321, Little Town (DE)');
+        cy.wrap($address)
+          .find('[data-test=address-phone]')
+          .should('contain', 'None');
+        cy.wrap($address)
+          .find('[data-test=address-email]')
+          .should('contain', 'charlie.bucket@commercetools.com');
+      });
+
+    cy.get('[data-test=summary-billing-address-edit]').click();
+    cy.get('[data-test=checkout-form-same-as-shipping]').uncheck();
+
+    cy.get('[data-test=address-form-firstName]').type('Willy');
+    cy.get('[data-test=address-form-lastName]').type('Wonka');
+    cy.get('[data-test=address-form-streetName]').type('Cherry Street');
+    cy.get('[data-test=address-form-additionalStreetInfo]').type('Chocolate Factory');
+    cy.get('[data-test=address-form-postalCode]').type('12345');
+    cy.get('[data-test=address-form-city]').type('Little Town');
+    cy.get('[data-test=address-form-phone]').type('555-44-22-11');
+    cy.get('[data-test=address-form-email]').type('willy.wonka@commercetools.com');
+
+    cy.get('[data-test=continue-checkout-button]').click();
+
+    cy.get('[data-test=checkout-form-shipping-methods]')
+      .find('label')
+      .should('have.length', 2);
+
     cy.get('[data-test=continue-checkout-button]').click();
 
     cy.get('[data-test=checkout-form-payment-methods]')

From 4d15528c59ff8c25872fb42687d9fd4a2d6c9650 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 4 Nov 2019 18:35:35 +0100
Subject: [PATCH 62/69] Fix e2e test regarding US currency

---
 tests/e2e/specs/locationSelector_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/locationSelector_spec.js b/tests/e2e/specs/locationSelector_spec.js
index 78c5b152..47757417 100644
--- a/tests/e2e/specs/locationSelector_spec.js
+++ b/tests/e2e/specs/locationSelector_spec.js
@@ -17,7 +17,7 @@ describe('Location selector', () => {
 
   it('changes prices to selected country', () => {
     cy.changeCountry('United States');
-    cy.get('[data-test=product-original-price]').contains(/^\s*US\$174.12\s*$/);
+    cy.get('[data-test=product-original-price]').contains(/^\s*(US)?\$174.12\s*$/);
     cy.changeCountry('Deutschland');
     cy.get('[data-test=product-original-price]').contains(/^\s*174,12\s€\s*$/);
   });

From 81c54267b8281f0b8d8b9ce0f18b265edf80fed5 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 2 Dec 2019 17:22:56 +0100
Subject: [PATCH 63/69] Revert using @ to import in a component

---
 src/components/common/cartlike/RemoveDiscountCodeForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/cartlike/RemoveDiscountCodeForm.vue b/src/components/common/cartlike/RemoveDiscountCodeForm.vue
index 0b2f0cdf..e1a925c0 100644
--- a/src/components/common/cartlike/RemoveDiscountCodeForm.vue
+++ b/src/components/common/cartlike/RemoveDiscountCodeForm.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import cartMixin from '@/mixins/cartMixin';
+import cartMixin from '../../../mixins/cartMixin';
 
 export default {
   props: {

From 107e597c904f16f374b90084aca7c00f43991fe0 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 2 Dec 2019 22:53:47 +0100
Subject: [PATCH 64/69] Update lock files

---
 package-lock.json | 181 +++++++++++++++++++++++++++++++---------------
 yarn.lock         | 106 +++++++++++++++++----------
 2 files changed, 188 insertions(+), 99 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f520db0..4c62dc56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1139,9 +1139,9 @@
       "dev": true
     },
     "@hapi/hoek": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.3.0.tgz",
-      "integrity": "sha512-C0QL9bmgUXTSuf8nDeGrpMjtJG7tPUr8wG6/wxPbP62tGwCwQtdMSJYfESowmY4P3Hn593f+8OzNY5bckcu/LQ==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.5.tgz",
+      "integrity": "sha512-rmGFzok1zR3xZKd5m3ihWdqafXFxvPHoQ/78+AG5URKbEbJiwBBfRgzbu+07W5f3+07JRshw6QqGbVmCp8ntig==",
       "dev": true
     },
     "@hapi/joi": {
@@ -1157,9 +1157,9 @@
       }
     },
     "@hapi/topo": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.5.tgz",
-      "integrity": "sha512-bi9m1jrui9LlvtVdLaHv0DqeOoe+I8dep+nEcTgW6XxJHL3xArQcilYz3tIp0cRC4gWlsVtABK7vNKg4jzEmAA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.4.tgz",
+      "integrity": "sha512-aVWQTOI9wBD6zawmOr6f+tdEIxQC8JXfQVLTjgGe8YEStAWGn/GNNVTobKJhbWKveQj2RyYF3oYbO9SC8/eOCA==",
       "dev": true,
       "requires": {
         "@hapi/hoek": "8.x.x"
@@ -2675,9 +2675,9 @@
       }
     },
     "apollo-server-core": {
-      "version": "2.9.5",
-      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.5.tgz",
-      "integrity": "sha512-SlM/vhjhWb0ayXV3d4gnpq9gh2BsQj+UPfQXfq2X2KG9EH5I1JUH6EtlsctgMCZozirOZmEmUzlqZWSSUOUPgQ==",
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.4.tgz",
+      "integrity": "sha512-6mzipnn9woJxgo/JQFWTlY13svS7HCr0ZsN035eRmKOsXzROfB9ugXcTuc6MP94ICM7TlB/DtJOP+bLX53mijw==",
       "requires": {
         "@apollographql/apollo-tools": "^0.4.0",
         "@apollographql/graphql-playground-html": "1.6.24",
@@ -2717,9 +2717,9 @@
       "integrity": "sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g=="
     },
     "apollo-server-express": {
-      "version": "2.9.5",
-      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.9.5.tgz",
-      "integrity": "sha512-6gonP7g5u2Kr+9cvKE+NuGPe+As7wRbz2yWoyLOym/TdXBmTRU4AKW2Qs+wpNanurzm2xbTa7sEfzrHGmembrQ==",
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.9.4.tgz",
+      "integrity": "sha512-diX9n81E0tIJ0Sy2bHvDGPM9QsFBsZ76Nx/dszinY00ViyWG0yIAYEYWeRbsoKTeNDWWTvlMrh/3Eu2oaCIEhQ==",
       "requires": {
         "@apollographql/graphql-playground-html": "1.6.24",
         "@types/accepts": "^1.3.5",
@@ -2727,7 +2727,7 @@
         "@types/cors": "^2.8.4",
         "@types/express": "4.17.1",
         "accepts": "^1.3.5",
-        "apollo-server-core": "^2.9.5",
+        "apollo-server-core": "^2.9.4",
         "apollo-server-types": "^0.2.4",
         "body-parser": "^1.18.3",
         "cors": "^2.8.4",
@@ -2987,18 +2987,18 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
     },
     "autoprefixer": {
-      "version": "9.6.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.4.tgz",
-      "integrity": "sha512-Koz2cJU9dKOxG8P1f8uVaBntOv9lP4yz9ffWvWaicv9gHBPhpQB22nGijwd8gqW9CNT+UdkbQOQNLVI8jN1ZfQ==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
+      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.7.0",
-        "caniuse-lite": "^1.0.30000998",
+        "browserslist": "^4.6.3",
+        "caniuse-lite": "^1.0.30000980",
         "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.18",
-        "postcss-value-parser": "^4.0.2"
+        "postcss": "^7.0.17",
+        "postcss-value-parser": "^4.0.0"
       },
       "dependencies": {
         "postcss-value-parser": {
@@ -4557,9 +4557,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000999",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz",
-      "integrity": "sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==",
+      "version": "1.0.30000998",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz",
+      "integrity": "sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ==",
       "dev": true
     },
     "capture-exit": {
@@ -6528,9 +6528,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.277",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.277.tgz",
-      "integrity": "sha512-Czmsrgng89DOgJlIknnw9bn5431QdtnUwGp5YYiPwU1DbZQUxCLF+rc1ZC09VNAdalOPcvH6AE8BaA0H5HjI/w==",
+      "version": "1.3.273",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.273.tgz",
+      "integrity": "sha512-0kUppiHQvHEENHh+nTtvTt4eXMwcPyWmMaj73GPrSEm3ldKhmmHuOH6IjrmuW6YmyS/fpXcLvMQLNVpqRhpNWw==",
       "dev": true
     },
     "elegant-spinner": {
@@ -9600,9 +9600,9 @@
       }
     },
     "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
       "dev": true
     },
     "ip": {
@@ -11416,12 +11416,12 @@
       "dev": true
     },
     "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "invert-kv": "^2.0.0"
+        "invert-kv": "^1.0.0"
       }
     },
     "left-pad": {
@@ -12344,22 +12344,12 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
-        }
+        "mimic-fn": "^1.0.0"
       }
     },
     "memory-fs": {
@@ -13364,14 +13354,42 @@
       "dev": true
     },
     "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
       "dev": true,
       "requires": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
+        "execa": "^0.7.0",
+        "lcid": "^1.0.0",
+        "mem": "^1.1.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        }
       }
     },
     "os-tmpdir": {
@@ -16351,9 +16369,9 @@
       }
     },
     "terser": {
-      "version": "4.3.8",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.8.tgz",
-      "integrity": "sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.4.tgz",
+      "integrity": "sha512-Kcrn3RiW8NtHBP0ssOAzwa2MsIRQ8lJWiBG/K7JgqPlomA3mtb2DEmp4/hrUA+Jujx+WZ02zqd7GYD+QRBB/2Q==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -17786,12 +17804,27 @@
             "resolve-cwd": "^2.0.0"
           }
         },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+          "dev": true
+        },
         "is-absolute-url": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
           "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
           "dev": true
         },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "dev": true,
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
         "locate-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -17802,12 +17835,40 @@
             "path-exists": "^3.0.0"
           }
         },
+        "mem": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+          "dev": true,
+          "requires": {
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
         "p-limit": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
@@ -18297,16 +18358,16 @@
       }
     },
     "yargs": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
-      "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
+      "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
       "dev": true,
       "requires": {
         "cliui": "^4.0.0",
         "decamelize": "^1.1.1",
         "find-up": "^2.1.0",
         "get-caller-file": "^1.0.1",
-        "os-locale": "^3.1.0",
+        "os-locale": "^2.0.0",
         "require-directory": "^2.1.1",
         "require-main-filename": "^1.0.1",
         "set-blocking": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 8749e8a9..4c70fa13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -859,9 +859,9 @@
   integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
 "@hapi/hoek@8.x.x":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.3.0.tgz#2b9db1cd00f3891005c77b3a8d608b88a6d0aa4d"
-  integrity sha512-C0QL9bmgUXTSuf8nDeGrpMjtJG7tPUr8wG6/wxPbP62tGwCwQtdMSJYfESowmY4P3Hn593f+8OzNY5bckcu/LQ==
+  version "8.2.5"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.2.5.tgz#b307d3f1aced22e05bd6a2403c302eaebb577da3"
+  integrity sha512-rmGFzok1zR3xZKd5m3ihWdqafXFxvPHoQ/78+AG5URKbEbJiwBBfRgzbu+07W5f3+07JRshw6QqGbVmCp8ntig==
 
 "@hapi/joi@^15.0.1":
   version "15.1.1"
@@ -874,9 +874,9 @@
     "@hapi/topo" "3.x.x"
 
 "@hapi/topo@3.x.x":
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.5.tgz#3baea17e456530edad69a75c3fc7cde97dd6d331"
-  integrity sha512-bi9m1jrui9LlvtVdLaHv0DqeOoe+I8dep+nEcTgW6XxJHL3xArQcilYz3tIp0cRC4gWlsVtABK7vNKg4jzEmAA==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.4.tgz#42e2fe36f593d90ad258a08b582be128c141c45d"
+  integrity sha512-aVWQTOI9wBD6zawmOr6f+tdEIxQC8JXfQVLTjgGe8YEStAWGn/GNNVTobKJhbWKveQj2RyYF3oYbO9SC8/eOCA==
   dependencies:
     "@hapi/hoek" "8.x.x"
 
@@ -1937,10 +1937,10 @@ apollo-server-caching@^0.5.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.9.5:
-  version "2.9.5"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.5.tgz#b2d9188d7acce5fe92a5460d276794988ffa6737"
-  integrity sha512-SlM/vhjhWb0ayXV3d4gnpq9gh2BsQj+UPfQXfq2X2KG9EH5I1JUH6EtlsctgMCZozirOZmEmUzlqZWSSUOUPgQ==
+apollo-server-core@^2.9.4:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.4.tgz#0404455884951804d23ea64e45514c73afd34e5e"
+  integrity sha512-6mzipnn9woJxgo/JQFWTlY13svS7HCr0ZsN035eRmKOsXzROfB9ugXcTuc6MP94ICM7TlB/DtJOP+bLX53mijw==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.0"
     "@apollographql/graphql-playground-html" "1.6.24"
@@ -1978,9 +1978,9 @@ apollo-server-errors@^2.3.3:
   integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==
 
 apollo-server-express@^2.2.0:
-  version "2.9.5"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.5.tgz#383e0a5cb80cf1172b0bc1e565797edd629d750a"
-  integrity sha512-6gonP7g5u2Kr+9cvKE+NuGPe+As7wRbz2yWoyLOym/TdXBmTRU4AKW2Qs+wpNanurzm2xbTa7sEfzrHGmembrQ==
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.4.tgz#ae7ca0b70a644ba9fa5e3ac395d1e2d9a4b23522"
+  integrity sha512-diX9n81E0tIJ0Sy2bHvDGPM9QsFBsZ76Nx/dszinY00ViyWG0yIAYEYWeRbsoKTeNDWWTvlMrh/3Eu2oaCIEhQ==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/accepts" "^1.3.5"
@@ -1988,7 +1988,7 @@ apollo-server-express@^2.2.0:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.1"
     accepts "^1.3.5"
-    apollo-server-core "^2.9.5"
+    apollo-server-core "^2.9.4"
     apollo-server-types "^0.2.4"
     body-parser "^1.18.3"
     cors "^2.8.4"
@@ -2237,17 +2237,17 @@ atob@^2.1.1:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.5.1:
-  version "9.6.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.4.tgz#e6453be47af316b2923eaeaed87860f52ad4b7eb"
-  integrity sha512-Koz2cJU9dKOxG8P1f8uVaBntOv9lP4yz9ffWvWaicv9gHBPhpQB22nGijwd8gqW9CNT+UdkbQOQNLVI8jN1ZfQ==
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
+  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
   dependencies:
-    browserslist "^4.7.0"
-    caniuse-lite "^1.0.30000998"
+    browserslist "^4.6.3"
+    caniuse-lite "^1.0.30000980"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.18"
-    postcss-value-parser "^4.0.2"
+    postcss "^7.0.17"
+    postcss-value-parser "^4.0.0"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -3278,7 +3278,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.6, browserslist@^4.7.0:
+browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.6:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
   integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==
@@ -3487,10 +3487,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30000998:
-  version "1.0.30000999"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz#427253a69ad7bea4aa8d8345687b8eec51ca0e43"
-  integrity sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000989:
+  version "1.0.30000998"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz#7227a8046841e7d01e156ae7227a504d065f6744"
+  integrity sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ==
 
 capture-exit@^1.2.0:
   version "1.2.0"
@@ -4867,9 +4867,9 @@ ejs@^2.6.1:
   integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==
 
 electron-to-chromium@^1.3.247:
-  version "1.3.277"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.277.tgz#38b7b297f9b3f67ea900a965c1b11a555de526ec"
-  integrity sha512-Czmsrgng89DOgJlIknnw9bn5431QdtnUwGp5YYiPwU1DbZQUxCLF+rc1ZC09VNAdalOPcvH6AE8BaA0H5HjI/w==
+  version "1.3.273"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.273.tgz#94872d6823219f2812f2e35a2ce2a7d03c1eaa3f"
+  integrity sha512-0kUppiHQvHEENHh+nTtvTt4eXMwcPyWmMaj73GPrSEm3ldKhmmHuOH6IjrmuW6YmyS/fpXcLvMQLNVpqRhpNWw==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -6852,6 +6852,11 @@ invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
@@ -8020,6 +8025,13 @@ lazy-ass@1.6.0:
   resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
   integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM=
 
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+  dependencies:
+    invert-kv "^1.0.0"
+
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
@@ -8493,6 +8505,13 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
+  dependencies:
+    mimic-fn "^1.0.0"
+
 mem@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
@@ -9378,7 +9397,16 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@^3.0.0, os-locale@^3.1.0:
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+os-locale@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -10082,7 +10110,7 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.2:
+postcss-value-parser@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
   integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
@@ -10096,7 +10124,7 @@ postcss@^6.0.1, postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.18, postcss@^7.0.5:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.5:
   version "7.0.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
   integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
@@ -11788,9 +11816,9 @@ terser-webpack-plugin@^1.2.3, terser-webpack-plugin@^1.4.1:
     worker-farm "^1.7.0"
 
 terser@^4.1.2:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136"
-  integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.4.tgz#ad91bade95619e3434685d69efa621a5af5f877d"
+  integrity sha512-Kcrn3RiW8NtHBP0ssOAzwa2MsIRQ8lJWiBG/K7JgqPlomA3mtb2DEmp4/hrUA+Jujx+WZ02zqd7GYD+QRBB/2Q==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -13120,15 +13148,15 @@ yargs@12.0.5:
     yargs-parser "^11.1.1"
 
 yargs@^11.0.0:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
-  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.1.1"
     find-up "^2.1.0"
     get-caller-file "^1.0.1"
-    os-locale "^3.1.0"
+    os-locale "^2.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"

From 64ee3b89f85aa4f2c36ef83b55e8e132611deb66 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 12 Dec 2019 15:13:41 +0100
Subject: [PATCH 65/69] Fix e2e test name

---
 tests/e2e/specs/checkoutPage_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/checkoutPage_spec.js b/tests/e2e/specs/checkoutPage_spec.js
index 39f60728..910efd2d 100644
--- a/tests/e2e/specs/checkoutPage_spec.js
+++ b/tests/e2e/specs/checkoutPage_spec.js
@@ -3,7 +3,7 @@ describe('CheckoutPage', () => {
     cy.visit('/');
   });
 
-  function shouldShowCorrectCartLike() {
+  function shouldAllowToPlaceOrders() {
     cy.get('[data-test=summary-shipping-address]')
       .then(($address) => {
         cy.wrap($address)

From 23a3125d164be519c7c9e053d11b60026d12eb56 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 12 Dec 2019 15:20:57 +0100
Subject: [PATCH 66/69] Revert "Fix e2e test name"

This reverts commit 64ee3b89f85aa4f2c36ef83b55e8e132611deb66.
---
 tests/e2e/specs/checkoutPage_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/specs/checkoutPage_spec.js b/tests/e2e/specs/checkoutPage_spec.js
index 910efd2d..39f60728 100644
--- a/tests/e2e/specs/checkoutPage_spec.js
+++ b/tests/e2e/specs/checkoutPage_spec.js
@@ -3,7 +3,7 @@ describe('CheckoutPage', () => {
     cy.visit('/');
   });
 
-  function shouldAllowToPlaceOrders() {
+  function shouldShowCorrectCartLike() {
     cy.get('[data-test=summary-shipping-address]')
       .then(($address) => {
         cy.wrap($address)

From c3e5bb97724140e504a057d4cd828477dadad2cc Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 12 Dec 2019 15:31:52 +0100
Subject: [PATCH 67/69] Fix indentation in checkout title

---
 src/components/checkout/CheckoutTitle.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/checkout/CheckoutTitle.vue b/src/components/checkout/CheckoutTitle.vue
index a7935b0f..39cf8b44 100644
--- a/src/components/checkout/CheckoutTitle.vue
+++ b/src/components/checkout/CheckoutTitle.vue
@@ -2,14 +2,14 @@
   <div class="row">
     <div class="col-md-6">
       <div class="secure-payment">
-            <span>
-              <img src="../../assets/img/credit-card-lock.png"
-                   class="secure-payment-icon"
-                   :alt="$t('securePayment')">
-            </span>
+        <span>
+          <img src="../../assets/img/credit-card-lock.png"
+               class="secure-payment-icon"
+               :alt="$t('securePayment')">
+        </span>
         <span class="text-uppercase secure-payment-title">
-              {{ $t("secureCheckout") }}
-            </span>
+          {{ $t("secureCheckout") }}
+        </span>
       </div>
     </div>
     <div class="col-md-6">

From 4637cbdc3d604e48bbe068a43d0b9f760db2b137 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 12 Dec 2019 19:11:25 +0100
Subject: [PATCH 68/69] Fix bug in which cart would be doubled created because
 of false positive of cartExists

---
 src/components/productdetail/AddToCartForm.vue             | 7 ++++++-
 .../components/cartdetail/LineItemQuantityForm.spec.js     | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue
index 0d86f775..3cb4902f 100644
--- a/src/components/productdetail/AddToCartForm.vue
+++ b/src/components/productdetail/AddToCartForm.vue
@@ -1,5 +1,6 @@
 <template>
-  <BaseForm :vuelidate="$v"
+  <BaseForm v-if="!isLoading"
+            :vuelidate="$v"
             :onSubmit="addLineItem"
             #default="{ error, state }">
     <ServerError :error="error"/>
@@ -72,6 +73,10 @@ export default {
   }),
 
   computed: {
+    isLoading() {
+      return this.$apollo.loading;
+    },
+
     quantities() {
       return [...Array(MAX_QUANTITY).keys()].map(i => ({ id: i + 1, name: i + 1 }));
     },
diff --git a/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js b/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
index fe9934ab..36ff04b9 100644
--- a/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
+++ b/tests/unit/specs/components/cartdetail/LineItemQuantityForm.spec.js
@@ -15,7 +15,6 @@ describe('LineItemQuantityForm.vue', () => {
     options = {
       localVue,
       propsData: { lineItemId: 'li-id', quantity: 3 },
-      computed: { cartExists: () => true },
       methods: { debouncedSubmit: mockedDebounced },
     };
   });

From 16d9ab5d0c92e5dc052bce80e3675522e6f65602 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Thu, 12 Dec 2019 19:16:05 +0100
Subject: [PATCH 69/69] Fix unit test due to previous changes

---
 .../specs/components/productdetail/AddToCartForm.spec.js     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/unit/specs/components/productdetail/AddToCartForm.spec.js b/tests/unit/specs/components/productdetail/AddToCartForm.spec.js
index c7b52b6b..1b468cdb 100644
--- a/tests/unit/specs/components/productdetail/AddToCartForm.spec.js
+++ b/tests/unit/specs/components/productdetail/AddToCartForm.spec.js
@@ -23,7 +23,10 @@ describe('AddToCartForm.vue', () => {
       mocks: { $t: jest.fn() },
       store: new Vuex.Store({ actions }),
       propsData: { sku: 'some-sku' },
-      computed: { currency: () => 'EUR' },
+      computed: {
+        currency: () => 'EUR',
+        isLoading: jest.fn(),
+      },
       methods: {
         createMyCart: jest.fn(() => Promise.resolve({})),
         updateMyCart: jest.fn(() => Promise.resolve({})),