From 42ae44517b0870815d2fe4a298d31cc2f5150f6a Mon Sep 17 00:00:00 2001
From: Ilya Litvinenko <ilya.ivanov6@gmail.com>
Date: Wed, 15 Apr 2020 12:56:33 +0200
Subject: [PATCH 1/8] VP-1595: Fix remove button wrapping (#107)

* Fix long name case in editDraftHeader and width of input in Firefox

* Remove unnecessary attribute

* Fix remove button wrapping

Co-authored-by: Anton <superiorboroda@gmail.com>
---
 .../src/libs/shopping-cart/components/cart-header/index.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client-app/src/libs/shopping-cart/components/cart-header/index.vue b/client-app/src/libs/shopping-cart/components/cart-header/index.vue
index e208948..cf79fce 100644
--- a/client-app/src/libs/shopping-cart/components/cart-header/index.vue
+++ b/client-app/src/libs/shopping-cart/components/cart-header/index.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="d-flex flex-wrap justify-content-between">
+  <div class="d-flex justify-content-between">
     <h5 class="align-self-center m-0 text-break">
       {{ title }}
     </h5>
     <button v-if="cart.itemsCount != 0"
-            class="btn btn-link px-0"
+            class="btn btn-link px-0 text-nowrap"
             @click="onClearCartClicked()">
       {{ $t('shopping-cart.clear-cart') }}
     </button>

From 0b73e49ffbea7dcd5132eddb4b3606f3f4e70ec1 Mon Sep 17 00:00:00 2001
From: Anton <superiorboroda@gmail.com>
Date: Wed, 15 Apr 2020 18:05:47 +0300
Subject: [PATCH 2/8] VP-1954: Fix form submitting on enter key (#108)

* blur after modal is hidden.

* VP-1954:  fix forms submitting on enter key

* revert little changes
---
 .../order-draft/components/add-draft-modal/index.vue     | 6 ++++--
 .../src/libs/user/components/add-user-modal/index.vue    | 8 +++++---
 .../src/libs/user/components/edit-user-modal/index.vue   | 9 ++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/client-app/src/libs/order-draft/components/add-draft-modal/index.vue b/client-app/src/libs/order-draft/components/add-draft-modal/index.vue
index 1d805eb..76b06ee 100644
--- a/client-app/src/libs/order-draft/components/add-draft-modal/index.vue
+++ b/client-app/src/libs/order-draft/components/add-draft-modal/index.vue
@@ -1,11 +1,13 @@
 <template>
   <b-modal id="addDraftModal"
            no-close-on-backdrop
-           @hide="resetForm">
+           @hidden="resetForm">
     <div slot="modal-title">
       {{ $t("account.drafts.add-draft.title") }}
     </div>
-    <b-form>
+    <b-form id="add-draft-form"
+            novalidate
+            @submit.prevent="submitForm">
       <b-form-group
         :label="$t('account.drafts.add-draft.draft-name-label')"
         label-for="draftName">
diff --git a/client-app/src/libs/user/components/add-user-modal/index.vue b/client-app/src/libs/user/components/add-user-modal/index.vue
index 469ca1c..87ccb22 100644
--- a/client-app/src/libs/user/components/add-user-modal/index.vue
+++ b/client-app/src/libs/user/components/add-user-modal/index.vue
@@ -1,11 +1,13 @@
 <template>
   <b-modal id="addUserModal"
            no-close-on-backdrop
-           @hide="resetForm">
+           @hidden="resetForm">
     <div slot="modal-title">
       {{ $t("account.users.add-user.title") }}
     </div>
-    <b-form>
+    <b-form id="add-user-form"
+            novalidate
+            @submit.prevent="submitForm">
       <b-form-group :label="$t('account.users.add-user.email-label')"
                     label-for="email">
         <b-form-input
@@ -157,7 +159,7 @@
     </b-form>
     <template v-slot:modal-footer>
       <b-button
-        variant="primary"
+        variant="outline-primary"
         :disabled="$v.user.$invalid"
         @click="submitForm">
         {{ $t("account.users.add-user.submit") }}
diff --git a/client-app/src/libs/user/components/edit-user-modal/index.vue b/client-app/src/libs/user/components/edit-user-modal/index.vue
index 230f869..640bbee 100644
--- a/client-app/src/libs/user/components/edit-user-modal/index.vue
+++ b/client-app/src/libs/user/components/edit-user-modal/index.vue
@@ -1,11 +1,14 @@
 <template>
   <b-modal id="editUserModal"
            no-close-on-backdrop
-           @hide="resetForm">
+           @hidden="resetForm">
     <div slot="modal-title">
       {{ $t("account.users.edit-user-title") }}
     </div>
-    <b-form v-if="userInfo">
+    <b-form v-if="userInfo"
+            id="edit-user-form"
+            novalidate
+            @submit.prevent="submitForm">
       <b-form-group :label="$t('account.users.add-user.email-label')" label-for="email">
         <b-form-input
           id="email"
@@ -62,7 +65,7 @@
     </b-form>
     <template v-slot:modal-footer>
       <b-button
-        variant="primary"
+        variant="outline-primary"
         :disabled="$v.userInfo.$invalid"
         @click="submitForm">
         {{ $t("account.users.add-user.submit") }}

From 5524926442c6644cd592126ba702f296fe9c6f68 Mon Sep 17 00:00:00 2001
From: Anton <superiorboroda@gmail.com>
Date: Wed, 15 Apr 2020 18:57:11 +0300
Subject: [PATCH 3/8] VP-1923: Make some improvements after testing (#109)

* VP-1923: Add title and localization for "Add to order draft" button

* VP:1923: Show devider only when list of drafts is not empty

* VP-1923: Disable add to draft ability if product alrady in the draft

* Add missed semicolon
---
 .../add-to-order-draft-button/add-to-order-draft-button.ts  | 4 ++++
 .../shopping-cart/views/add-to-order-draft-button/index.vue | 6 ++++--
 locales/de.json                                             | 2 ++
 locales/en.default.json                                     | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/add-to-order-draft-button.ts b/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/add-to-order-draft-button.ts
index a2485b0..c1a588e 100644
--- a/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/add-to-order-draft-button.ts
+++ b/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/add-to-order-draft-button.ts
@@ -56,4 +56,8 @@ export default class AddToDraftButton extends Vue {
     await this.addItemToDraft(addItemToDraft);
   }
 
+  isItemDisabled(draft: ShoppingCart) {
+    return  draft.items?.some(x => x.productId == this.productId);
+  }
+
 }
diff --git a/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/index.vue b/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/index.vue
index d1747b7..429016e 100644
--- a/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/index.vue
+++ b/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/index.vue
@@ -3,6 +3,7 @@
     <add-draft-modal @draftAdded="addToNewDraft($event)"></add-draft-modal>
     <b-dropdown ref="dropdown"
                 class="w-100 h-100"
+                :title="$t('products.general.add_to_order_draft')"
                 right
                 variant="outline-primary">
       <template v-slot:button-content>
@@ -13,11 +14,12 @@
                  :variant="'white'"
                  :opacity="0.69">
         <b-dropdown-item v-b-modal.addDraftModal>
-          <font-awesome-icon :icon="plusIcon"></font-awesome-icon> Add to new order draft
+          <font-awesome-icon :icon="plusIcon"></font-awesome-icon> {{ $t('products.general.add_to_new_order_draft') }}
         </b-dropdown-item>
-        <b-dropdown-divider></b-dropdown-divider>
+        <b-dropdown-divider v-if="drafts.results.length > 0"></b-dropdown-divider>
         <b-dropdown-item v-for="draft in drafts.results"
                          :key="draft.name"
+                         :disabled="isItemDisabled(draft)"
                          @click="addToDraft(draft)">
           {{ draft.name }}
         </b-dropdown-item>
diff --git a/locales/de.json b/locales/de.json
index 3befcf7..5d3be80 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -126,6 +126,8 @@
     "general": {
       "save_html": "Speichern {0}",
       "add_to_cart": "In den Einkaufswagen legen",
+      "add_to_order_draft": "Zum Auftragsentwurf hinzufügen",
+      "add_to_new_order_draft": "Zum neuen Auftragsentwurf hinzufügen",
       "add_to_quote": "Zum Zitat hinzufügen",
       "description_tab": "Produktbeschreibung"
     },
diff --git a/locales/en.default.json b/locales/en.default.json
index 9bd9eca..618ea12 100644
--- a/locales/en.default.json
+++ b/locales/en.default.json
@@ -126,6 +126,8 @@
     "general": {
       "save_html": "Save {0}",
       "add_to_cart": "Add to cart",
+      "add_to_order_draft": "Add to order draft",
+      "add_to_new_order_draft": "Add to new order draft",
       "add_to_quote": "Add to quote"
     },
     "product": {

From 96283efe018dcf3ff1f9402f8bb08d03edef5055 Mon Sep 17 00:00:00 2001
From: Ilya Litvinenko <ilya.ivanov6@gmail.com>
Date: Thu, 16 Apr 2020 04:49:25 +0200
Subject: [PATCH 4/8] VP-1955:  Add duplicate check to add draft form (#111)

* VP-1955:  Add duplicate check to add draft form

+ fix path for nswag output

* Use shorter syntax
---
 client-app/nswag.json                             |  2 +-
 .../components/add-draft-modal/add-draft-modal.ts | 15 ++++++++++++++-
 .../components/add-draft-modal/index.vue          |  4 ++++
 locales/de.json                                   |  1 +
 locales/en.default.json                           |  1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/client-app/nswag.json b/client-app/nswag.json
index dbb43f4..863fd9b 100644
--- a/client-app/nswag.json
+++ b/client-app/nswag.json
@@ -64,7 +64,7 @@
       "enumNameGeneratorType": null,
       "serviceHost": null,
       "serviceSchemes": null,
-      "output": "src/common/api/api-clients.ts"
+      "output": "src/core/api/api-clients.ts"
     }
   }
 }
diff --git a/client-app/src/libs/order-draft/components/add-draft-modal/add-draft-modal.ts b/client-app/src/libs/order-draft/components/add-draft-modal/add-draft-modal.ts
index 01bdb15..0fc165c 100644
--- a/client-app/src/libs/order-draft/components/add-draft-modal/add-draft-modal.ts
+++ b/client-app/src/libs/order-draft/components/add-draft-modal/add-draft-modal.ts
@@ -1,11 +1,23 @@
 import Vue from "vue";
 import Component from "vue-class-component";
 import { Validation } from "vuelidate"; //Don't remove this import
+import { storeName, locale, orderDraftType, startPageNumber, defaultPageSize } from "core/constants";
+import { listClient } from "core/services/api-clients.service";
 import { required } from "vuelidate/lib/validators";
+import { CartSearchCriteria } from '@core/api/api-clients';
 
 @Component({
   validations: {
-    draftName: { required }
+    draftName: {
+      required,
+      async isUnique(value) {
+        if (value === '') return true;
+        const criteria = new CartSearchCriteria({type: orderDraftType, pageNumber: startPageNumber, pageSize: defaultPageSize});
+        criteria.keyword = value;
+        const result = await listClient.searchLists(criteria, storeName, locale);
+        return result.totalCount == 0;
+      }
+    }
   }
 })
 export default class AddDraftModal extends Vue {
@@ -22,4 +34,5 @@ export default class AddDraftModal extends Vue {
     this.$emit("draftAdded", this.draftName);
     this.$bvModal.hide("addDraftModal");
   }
+
 }
diff --git a/client-app/src/libs/order-draft/components/add-draft-modal/index.vue b/client-app/src/libs/order-draft/components/add-draft-modal/index.vue
index 76b06ee..9ccf5c4 100644
--- a/client-app/src/libs/order-draft/components/add-draft-modal/index.vue
+++ b/client-app/src/libs/order-draft/components/add-draft-modal/index.vue
@@ -17,10 +17,14 @@
           :class="{ 'is-invalid': $v.draftName.$error }"
           type="text"
           :placeholder="$t('account.drafts.add-draft.draft-name-placeholder')"
+          :debounce="1000"
           @blur="$v.draftName.$touch()"></b-form-input>
         <b-form-invalid-feedback v-if="!$v.draftName.required">
           {{ $t("account.drafts.add-draft.draft-name-required") }}
         </b-form-invalid-feedback>
+        <b-form-invalid-feedback v-if="!$v.draftName.isUnique">
+          {{ $t("account.drafts.add-draft.draft-name-unique") }}
+        </b-form-invalid-feedback>
       </b-form-group>
     </b-form>
     <template v-slot:modal-footer>
diff --git a/locales/de.json b/locales/de.json
index 5d3be80..c3cd13c 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -365,6 +365,7 @@
         "draft-name-label": "Entwurfsname",
         "draft-name-placeholder": "Entwurfsname",
         "draft-name-required": "Entwurfsname ist erforderlich",
+        "draft-name-unique": "Der Entwurfsname sollte eindeutig sein",
         "submit": "Einreichen"
       },
       "search-label": "Suche",
diff --git a/locales/en.default.json b/locales/en.default.json
index 618ea12..6e323da 100644
--- a/locales/en.default.json
+++ b/locales/en.default.json
@@ -324,6 +324,7 @@
         "draft-name-label": "Draft name",
         "draft-name-placeholder": "Draft name",
         "draft-name-required": "Draft name is required",
+        "draft-name-unique": "Draft name should be unique",
         "submit": "Submit"
       },
       "search-label": "Search",

From 967696093bfe96739c30cbcbaae276b97110b2e6 Mon Sep 17 00:00:00 2001
From: Anton <superiorboroda@gmail.com>
Date: Thu, 16 Apr 2020 05:53:32 +0300
Subject: [PATCH 5/8] VP-1923:  Add shopping cart/draft product adding  ability
 to the product page (#110)

* VP-1923:  Add shopping cart/drafts adding ability to the product page

Also to the collection page abilities was connected

* Fix the error at the header cart button during cart data loading
---
 .../add-to-cart-button/add-to-cart-button.ts  |  3 ++
 .../views/add-to-cart-button/index.vue        |  3 +-
 .../add-to-order-draft-button.ts              |  3 ++
 .../views/add-to-order-draft-button/index.vue |  1 +
 client-app/src/pages/catalog/main.ts          | 12 ++++---
 .../views/active-order-sidebar/index.vue      |  5 +--
 snippets/content_header.liquid                |  2 +-
 snippets/product-grid-item.liquid             |  8 ++---
 templates/collection.liquid                   |  2 ++
 templates/product.liquid                      | 33 +++++++------------
 10 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/client-app/src/libs/shopping-cart/views/add-to-cart-button/add-to-cart-button.ts b/client-app/src/libs/shopping-cart/views/add-to-cart-button/add-to-cart-button.ts
index b638423..c265895 100644
--- a/client-app/src/libs/shopping-cart/views/add-to-cart-button/add-to-cart-button.ts
+++ b/client-app/src/libs/shopping-cart/views/add-to-cart-button/add-to-cart-button.ts
@@ -14,6 +14,9 @@ export default class AddToCartButton extends Vue {
   @Prop()
   productId!: string;
 
+  @Prop()
+  textVisible!: boolean;
+
   @cartModule.Action(ADD_ITEM_TO_CART)
   addItemToCart!: (addItem: AddCartItem) => void;
 
diff --git a/client-app/src/libs/shopping-cart/views/add-to-cart-button/index.vue b/client-app/src/libs/shopping-cart/views/add-to-cart-button/index.vue
index 9cd0794..a14e1c1 100644
--- a/client-app/src/libs/shopping-cart/views/add-to-cart-button/index.vue
+++ b/client-app/src/libs/shopping-cart/views/add-to-cart-button/index.vue
@@ -1,8 +1,9 @@
 <template>
-  <button class="app-add-item-to-cart btn btn-outline-primary w-100 h-100 d-flex justify-content-center"
+  <button class="app-add-item-to-cart btn btn-outline-primary w-100 h-100"
           :title="$t('products.general.add_to_cart')"
           @click.prevent="onClick">
     <i class="fas fa-shopping-cart"></i>
+    <span v-if="textVisible">{{ $t('products.general.add_to_cart') }}</span>
   </button>
 </template>
 
diff --git a/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/add-to-order-draft-button.ts b/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/add-to-order-draft-button.ts
index c1a588e..4d37ece 100644
--- a/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/add-to-order-draft-button.ts
+++ b/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/add-to-order-draft-button.ts
@@ -26,6 +26,9 @@ export default class AddToDraftButton extends Vue {
   @Prop()
   productId!: string;
 
+  @Prop()
+  textVisible!: boolean;
+
   @draftModule.Getter("drafts")
   drafts!: ShoppingCartSearchResult[];
 
diff --git a/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/index.vue b/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/index.vue
index 429016e..5d7c758 100644
--- a/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/index.vue
+++ b/client-app/src/libs/shopping-cart/views/add-to-order-draft-button/index.vue
@@ -8,6 +8,7 @@
                 variant="outline-primary">
       <template v-slot:button-content>
         <i class="fas fa-file-alt"></i>
+        <span v-if="textVisible">{{ $t('products.general.add_to_order_draft') }}</span>
       </template>
       <b-overlay :show="isLoading"
                  rounded="sm"
diff --git a/client-app/src/pages/catalog/main.ts b/client-app/src/pages/catalog/main.ts
index bae635e..9a9abb6 100644
--- a/client-app/src/pages/catalog/main.ts
+++ b/client-app/src/pages/catalog/main.ts
@@ -22,24 +22,26 @@ const addToCartElements = document.getElementsByClassName("app-add-item-to-cart"
 
 for(const addToCartEl of addToCartElements){
   const productId = addToCartEl.attributes.getNamedItem("product-id")!.value
+  const textVisible = !!addToCartEl.attributes.getNamedItem("text-visible");
   new Vue({
     i18n,
     store,
     render ( h ) {
       return h(AddToCartButton, {
         props: {
-          productId: productId
+          productId: productId,
+          textVisible: textVisible
         }
       })
     }
-  }).$mount(addToCartEl, true);
+  }).$mount(addToCartEl);
 }
 
 new Vue({
   i18n,
   store,
   render: h => h(CartButton)
-}).$mount("#app-cart", true);
+}).$mount("#app-cart");
 
 
 
@@ -61,13 +63,15 @@ const addToDraftElements = document.getElementsByClassName("app-add-item-to-draf
 
 for(const addToDraftEl of addToDraftElements){
   const productId = addToDraftEl.attributes.getNamedItem("product-id")!.value
+  const textVisible = !!addToDraftEl.attributes.getNamedItem("text-visible");
   new Vue({
     i18n,
     store,
     render ( h ) {
       return h(AddToDraftButton, {
         props: {
-          productId: productId
+          productId: productId,
+          textVisible: textVisible
         }
       })
     }
diff --git a/client-app/src/pages/catalog/views/active-order-sidebar/index.vue b/client-app/src/pages/catalog/views/active-order-sidebar/index.vue
index f3d178c..513fc24 100644
--- a/client-app/src/pages/catalog/views/active-order-sidebar/index.vue
+++ b/client-app/src/pages/catalog/views/active-order-sidebar/index.vue
@@ -8,8 +8,9 @@
     @hidden="hide">
     <b-overlay :show="isLoading"
                rounded="sm"
-               :opacity="0.33">
-      <div class="d-flex flex-column">
+               :opacity="0.33"
+               class="h-100">
+      <div v-if="cart" class="d-flex flex-column">
         <cart-header
           :cart="cart"
           :title="$t('shopping-cart.title')"
diff --git a/snippets/content_header.liquid b/snippets/content_header.liquid
index cb796fa..e6e576c 100644
--- a/snippets/content_header.liquid
+++ b/snippets/content_header.liquid
@@ -10,7 +10,7 @@
             </ul>
             <ul class="navbar-nav ml-auto">
                 <li>
-                  <button id="app-cart" class="btn btn-secondary p-2 m-10"><i class="fas fa-shopping-cart"></i> <span></span></button>
+                  <span id="app-cart"></span>
                 </li>
                 <li class="nav-item">
                     {% if customer.is_registered_user %}
diff --git a/snippets/product-grid-item.liquid b/snippets/product-grid-item.liquid
index d537117..7c360a0 100644
--- a/snippets/product-grid-item.liquid
+++ b/snippets/product-grid-item.liquid
@@ -33,19 +33,19 @@
       <div class="form-row">
       {% if product.available %}
       <div class="col">
-        <button class="app-add-item-to-cart btn btn-outline-primary col d-flex justify-content-center p-1" title="{{ 'products.general.add_to_cart' | t }}" product-id="{{product.id}}"><i class="fas fa-shopping-cart"></i></button>
+        <button class="app-add-item-to-cart btn btn-outline-primary col" title="{{ 'products.general.add_to_cart' | t }}" product-id="{{product.id}}"><i class="fas fa-shopping-cart"></i></button>
       </div>
       <div class="col">
-          <button class="app-add-item-to-draft btn btn-outline-primary col d-flex justify-content-center p-1" title="{{ 'products.general.add_to_cart' | t }}" product-id="{{product.id}}"><i class="fas fa-file-alt"></i></button>
+          <button class="app-add-item-to-draft btn btn-outline-primary col" title="{{ 'products.general.add_to_cart' | t }}" product-id="{{product.id}}"><i class="fas fa-file-alt"></i></button>
       </div>
       {% endif %}
       {% if unavailable %}
-            <button class="btn btn-outline-primary w-100 d-flex justify-content-center p-1" title="{{ 'products.general.add_to_cart' | t }}" disabled>
+            <button class="btn btn-outline-primary w-100" title="{{ 'products.general.add_to_cart' | t }}" disabled>
           <span class="font-weight-bold text-uppercase">{{ 'products.product.unavailable' | t }}</span>
         </button>
       {% endif %}
       {% if sold_out %}
-            <button class="btn btn-outline-primary w-100 d-flex justify-content-center p-1" title="{{ 'products.general.add_to_cart' | t }}" disabled>
+            <button class="btn btn-outline-primary w-100" title="{{ 'products.general.add_to_cart' | t }}" disabled>
           <span class="font-weight-bold text-uppercase">{{ 'products.product.sold_out' | t }}</span>
         </button>
       {% endif %}
diff --git a/templates/collection.liquid b/templates/collection.liquid
index 8ee4228..ef07fee 100644
--- a/templates/collection.liquid
+++ b/templates/collection.liquid
@@ -1,2 +1,4 @@
 {{ paginator =  product_search_result.products | paginate }}
 {% include 'search-result' %}
+
+<script src="{{ 'bundle/dist/js/catalog.js' | static_asset_url | append_version }}"></script>
diff --git a/templates/product.liquid b/templates/product.liquid
index 695e433..a4ade38 100644
--- a/templates/product.liquid
+++ b/templates/product.liquid
@@ -1,5 +1,7 @@
 {% include 'breadcrumb' %}
 
+<div id="app-cart-sidebar"></div>
+
 {% assign on_sale = false %}
 {% if product.compare_at_price.amount > product.price.actual_price.amount %}
     {% assign on_sale = true %}
@@ -62,16 +64,18 @@
 
               {% if product.available %}
                 <div class="btn-group">
-                  <button class="btn btn-outline-primary mb-1" id="addToCart" type="button">
+                  <!-- <button class="btn btn-outline-primary mb-1" id="addToCart" type="button">
                     <span class="fas fa-shopping-cart"></span>
                     <span id="addToCartText">{{ 'products.general.add_to_cart' | t }}</span>
-                  </button>
+                  </button> -->
+                  <button class="app-add-item-to-cart btn btn-outline-primary" title="{{ 'products.general.add_to_cart' | t }}" product-id="{{product.id}}" text-visible><i class="fas fa-shopping-cart"></i>
+                    <span>{{ 'products.general.add_to_cart' | t }}</span></button>
                 </div>
               {% endif %}
 
               {% if unavailable %}
                 <div class="btn-group">
-                  <button class="btn btn-outline-primary mb-1" id="addToCart" type="button" disabled>
+                  <button class="btn btn-outline-primary" id="addToCart" type="button" disabled>
                     <span class="fas fa-shopping-cart"></span>
                     <span id="addToCartText">{{ 'products.product.unavailable' | t }}</span>
                   </button>
@@ -80,32 +84,17 @@
 
               {% if sold_out %}
                 <div class="btn-group">
-                  <button class="btn btn-outline-primary mb-1" id="addToCart" type="button" disabled>
+                  <button class="btn btn-outline-primary" id="addToCart" type="button" disabled>
                     <span class="fas fa-shopping-cart"></span>
                     <span id="addToCartText">{{ 'products.product.sold_out' | t }}</span>
                   </button>
                 </div>
               {% endif %}
 
-                <div class="btn-group">
-                  <button class="btn btn-outline-primary mb-1" id="addToQuote" type="button">
-                    <i class="fas fa-calculator"></i>
-                    <span id="addToQuoteText">{{ 'products.general.add_to_quote' | t }}</span>
-                  </button>
-                </div>
 
                 <div class="btn-group">
-                  <button class="btn btn-outline-primary mb-1" id="addToCompareList" type="button">
-                    <i class="fas fa-chart-bar"></i>
-                    <span id="addToCompareListText">{{ 'products.compare_list.add_to_compare' | t }}</span>
-                  </button>
-                </div>
-
-                <div class="btn-group">
-                  <button class="btn btn-outline-primary mb-1" id="addToWishlist" type="button">
-                    <i class="fas fa-file-alt"></i>
-                    <span>{{ 'products.list.add_to_myList' | t }}</span>
-                  </button>
+                  <button class="app-add-item-to-draft btn btn-outline-primary" title="{{ 'products.general.add_to_order_draft' | t }}" product-id="{{product.id}}" text-visible><i class="fas fa-file-alt"></i>
+                    <span>{{ 'products.general.add_to_order_draft' | t }}</span></button>
                 </div>
 
               </div>
@@ -159,3 +148,5 @@
     primaryImg.alt = alt;
   }
 </script>
+
+<script src="{{ 'bundle/dist/js/catalog.js' | static_asset_url | append_version }}"></script>

From 6094bef9fa2392467388c7550a1131edbed35c3b Mon Sep 17 00:00:00 2001
From: Ilya Litvinenko <ilya.ivanov6@gmail.com>
Date: Thu, 16 Apr 2020 09:24:34 +0200
Subject: [PATCH 6/8] Fix position of items in edit draft sidebar header (#112)

---
 .../src/libs/shopping-cart/components/cart-header/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client-app/src/libs/shopping-cart/components/cart-header/index.vue b/client-app/src/libs/shopping-cart/components/cart-header/index.vue
index cf79fce..d21a92a 100644
--- a/client-app/src/libs/shopping-cart/components/cart-header/index.vue
+++ b/client-app/src/libs/shopping-cart/components/cart-header/index.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="d-flex justify-content-between">
-    <h5 class="align-self-center m-0 text-break">
+  <div class="d-flex justify-content-between align-items-start">
+    <h5 class="m-0 text-break">
       {{ title }}
     </h5>
     <button v-if="cart.itemsCount != 0"
-            class="btn btn-link px-0 text-nowrap"
+            class="btn btn-link px-0 pt-0 text-nowrap"
             @click="onClearCartClicked()">
       {{ $t('shopping-cart.clear-cart') }}
     </button>

From 9529428ebc6d5c79a6421e6ce8230b6fe0f5e5f7 Mon Sep 17 00:00:00 2001
From: Anton <superiorboroda@gmail.com>
Date: Thu, 16 Apr 2020 10:36:04 +0300
Subject: [PATCH 7/8] VP-1934: Fix error. Update quantity in the sidebar on
 product adding (#113)

---
 .../change-item-quantity/change-item-quantity.ts          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client-app/src/libs/shopping-cart/components/change-item-quantity/change-item-quantity.ts b/client-app/src/libs/shopping-cart/components/change-item-quantity/change-item-quantity.ts
index 8357963..09e346b 100644
--- a/client-app/src/libs/shopping-cart/components/change-item-quantity/change-item-quantity.ts
+++ b/client-app/src/libs/shopping-cart/components/change-item-quantity/change-item-quantity.ts
@@ -1,6 +1,6 @@
 import Vue from "vue";
 import Component from "vue-class-component";
-import { Prop, Emit } from "vue-property-decorator";
+import { Prop, Emit, Watch } from "vue-property-decorator";
 import { faPlusCircle, faMinusCircle } from "@fortawesome/free-solid-svg-icons";
 
 
@@ -11,6 +11,12 @@ export default class ChangeItemQuantity extends Vue {
   @Prop()
   quantity!: number;
 
+
+  @Watch("quantity")
+  watchQuantity(value: number) {
+    this.model = value;
+  }
+
   model = 0;
 
   mounted (){

From d84aa0bdd60847c90633bfbaed4d26f2519732b7 Mon Sep 17 00:00:00 2001
From: Ilya Litvinenko <ilya.ivanov6@gmail.com>
Date: Thu, 16 Apr 2020 10:14:09 +0200
Subject: [PATCH 8/8] VP-1955: Fix duplicate check in catalog page (#114)

---
 .../order-draft/components/add-draft-modal/add-draft-modal.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client-app/src/libs/order-draft/components/add-draft-modal/add-draft-modal.ts b/client-app/src/libs/order-draft/components/add-draft-modal/add-draft-modal.ts
index 0fc165c..2e78282 100644
--- a/client-app/src/libs/order-draft/components/add-draft-modal/add-draft-modal.ts
+++ b/client-app/src/libs/order-draft/components/add-draft-modal/add-draft-modal.ts
@@ -12,7 +12,7 @@ import { CartSearchCriteria } from '@core/api/api-clients';
       required,
       async isUnique(value) {
         if (value === '') return true;
-        const criteria = new CartSearchCriteria({type: orderDraftType, pageNumber: startPageNumber, pageSize: defaultPageSize});
+        const criteria = new CartSearchCriteria({type: orderDraftType, pageNumber: startPageNumber, pageSize: defaultPageSize, name: value});
         criteria.keyword = value;
         const result = await listClient.searchLists(criteria, storeName, locale);
         return result.totalCount == 0;