From 98802361bc200b004cb86bc4484010de92a06f7b Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Fri, 31 Jan 2020 09:05:02 +0100 Subject: [PATCH 01/13] HIMA-969 Bestelldetails label adjustment --- .../customer-order-detail/customer-order-detail.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/sales/src/app/modules/customer/pages/customer-order-detail/customer-order-detail.component.html b/apps/sales/src/app/modules/customer/pages/customer-order-detail/customer-order-detail.component.html index e1cd09d95..fb8149838 100644 --- a/apps/sales/src/app/modules/customer/pages/customer-order-detail/customer-order-detail.component.html +++ b/apps/sales/src/app/modules/customer/pages/customer-order-detail/customer-order-detail.component.html @@ -50,6 +50,7 @@ [isOnlyOne]="onlyOneItemAvailable" [disableEdit]="onlineCustomer || guestCustomer" [paymentDataDTO]="paymentDataDTO" + [estimatedDateLabel]="isDownload ? 'Verfügbar ab' : 'Versand'" > From 9b60933e6b44be14e9d4048affcde28e960ea8fd Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Fri, 31 Jan 2020 09:17:39 +0100 Subject: [PATCH 02/13] HIMA-828 BoD change in cart has no option (e.g. 9781426729621) adjustment --- .../components/change-order-type/change-order-type.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sales/src/app/modules/cart/components/change-order-type/change-order-type.component.ts b/apps/sales/src/app/modules/cart/components/change-order-type/change-order-type.component.ts index 3bb866a3c..d3066f64d 100644 --- a/apps/sales/src/app/modules/cart/components/change-order-type/change-order-type.component.ts +++ b/apps/sales/src/app/modules/cart/components/change-order-type/change-order-type.component.ts @@ -105,7 +105,7 @@ export class ChangeOrderTypeComponent implements OnInit, OnDestroy { } get shippingAvailable() { - if (this.availability.filter(t => t.type === CheckoutType.delivery && t.status === 1024).length > 0) { + if (this.availability.filter(t => t.type === CheckoutType.delivery && allowedAvailabilityStatusCodes(t.status)).length > 0) { return of(true); } return of(false); From 3ac07eb53da9933c3f4b486f0abf8a5ab8a06169 Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Fri, 31 Jan 2020 10:25:04 +0100 Subject: [PATCH 03/13] HIMA-847 horizontal recommendations list style adjustments --- .../recommendations.component.html | 36 +++++++++++++------ .../recommendations.component.scss | 25 +++++++++---- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/apps/sales/src/app/modules/recommendations/recommendations.component.html b/apps/sales/src/app/modules/recommendations/recommendations.component.html index 5acd30665..ef3b56871 100644 --- a/apps/sales/src/app/modules/recommendations/recommendations.component.html +++ b/apps/sales/src/app/modules/recommendations/recommendations.component.html @@ -10,7 +10,7 @@ ARTIKEL -
+
-
- +
+
-
-
- book image - {{ item.type }} - {{ item.price | bookPrice }} EUR + +
+
+
+ book image + {{ item.type }} + {{ item.price | bookPrice }} EUR +
-
-
- +
+
+
diff --git a/apps/sales/src/app/modules/recommendations/recommendations.component.scss b/apps/sales/src/app/modules/recommendations/recommendations.component.scss index e1220faa8..5270f24a9 100644 --- a/apps/sales/src/app/modules/recommendations/recommendations.component.scss +++ b/apps/sales/src/app/modules/recommendations/recommendations.component.scss @@ -37,14 +37,20 @@ } } +.books-container { + position: relative; + width: 100%; + overflow: hidden; + padding: 0 20px 20px 20px; + box-sizing: border-box; +} + .books { display: flex; flex-direction: row; width: 100%; overflow-y: hidden; overflow-x: scroll; - position: relative; - padding: 0 20px 20px 20px; min-width: 100%; } @@ -103,10 +109,11 @@ } .book-layer-fade { - position: fixed; + position: absolute; height: 390px; width: 72px; z-index: 20; + top: 0; right: 0; opacity: 0.7; background-color: white; @@ -116,11 +123,12 @@ .icon-arrow { position: absolute; + top: 50%; right: 0; + transform: translateY(-50%); z-index: 30; opacity: 1; cursor: pointer; - padding-top: 75px; padding-right: 10px; } @@ -129,6 +137,7 @@ height: 390px; width: 72px; z-index: 20; + top: 0; left: 0; opacity: 0.7; background-color: white; @@ -141,16 +150,18 @@ height: 390px; width: 72px; z-index: 20; - left: 0px; + top: 0; + left: 0; opacity: 0.7; } .icon-arrow-start { position: absolute; - left: 0px; + top: 50%; + left: 0; + transform: translateY(-50%); z-index: 30; opacity: 1; cursor: pointer; - padding-top: 75px; padding-left: 10px; } From 83cbcef7a6f67b43010dfa69619f5c5a50df05c0 Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Fri, 31 Jan 2020 12:26:06 +0100 Subject: [PATCH 04/13] HIMA-783 Filiale style colors adjustments --- .../app/components/menu/menu.component.html | 2 +- .../goods-in-order-tag.component.html | 4 +-- ...d-product-to-remission-list.component.scss | 14 ++++---- apps/sales/src/assets/images/Check_89949E.svg | 11 ++++++ .../src/assets/images/Icon_Abholfach_B.svg | 4 +-- .../images/Icon_Abholfach_B_inactive.svg | 4 +-- .../src/assets/images/Icon_Remission.svg | 14 ++++---- .../assets/images/Icon_Remission_inactive.svg | 14 ++++---- .../assets/images/Icon_Tatigkeitskalender.svg | 4 +-- .../Icon_Tatigkeitskalender_inactive.svg | 13 +++++++ .../sales/src/assets/images/tag_body_grey.svg | 26 ++++++++++++++ .../assets/images/tag_icon_preorder_grey.svg | 17 +++++++++ apps/sales/src/assets/scss/_variables.scss | 4 +-- libs/ui/src/lib/button/button.component.scss | 2 +- .../date-picker/date-picker.component.scss | 2 +- .../search-input/search-input.component.scss | 4 +-- libs/ui/src/lib/tag/tag.component.html | 2 +- libs/ui/src/lib/tag/tag.component.scss | 35 +++++++++++-------- 18 files changed, 124 insertions(+), 52 deletions(-) create mode 100644 apps/sales/src/assets/images/Check_89949E.svg create mode 100644 apps/sales/src/assets/images/Icon_Tatigkeitskalender_inactive.svg create mode 100644 apps/sales/src/assets/images/tag_body_grey.svg create mode 100644 apps/sales/src/assets/images/tag_icon_preorder_grey.svg diff --git a/apps/sales/src/app/components/menu/menu.component.html b/apps/sales/src/app/components/menu/menu.component.html index fbd9ff951..7cbc0f95c 100644 --- a/apps/sales/src/app/components/menu/menu.component.html +++ b/apps/sales/src/app/components/menu/menu.component.html @@ -122,7 +122,7 @@
- +
Tätigkeitskalender
diff --git a/apps/sales/src/app/modules/goods-in/components/goods-in-order-tag/goods-in-order-tag.component.html b/apps/sales/src/app/modules/goods-in/components/goods-in-order-tag/goods-in-order-tag.component.html index ae4270c33..2efed07c8 100644 --- a/apps/sales/src/app/modules/goods-in/components/goods-in-order-tag/goods-in-order-tag.component.html +++ b/apps/sales/src/app/modules/goods-in/components/goods-in-order-tag/goods-in-order-tag.component.html @@ -1,7 +1,7 @@ - + - + diff --git a/apps/sales/src/app/modules/remission/pages/remission-add-product-to-remission-list/remission-add-product-to-remission-list.component.scss b/apps/sales/src/app/modules/remission/pages/remission-add-product-to-remission-list/remission-add-product-to-remission-list.component.scss index 8c60f7760..09835336f 100644 --- a/apps/sales/src/app/modules/remission/pages/remission-add-product-to-remission-list/remission-add-product-to-remission-list.component.scss +++ b/apps/sales/src/app/modules/remission/pages/remission-add-product-to-remission-list/remission-add-product-to-remission-list.component.scss @@ -45,7 +45,7 @@ width: 551px; outline: none; border: none; - border-bottom: 2px solid #e1ebf5; + border-bottom: 2px solid #EDEFF0; padding-bottom: 10px; font-family: 'Open Sans'; font-size: 18px; @@ -56,13 +56,13 @@ &.error { border-bottom: 2px solid #f70400; } - } - input::placeholder { - font-family: 'Open Sans'; - font-size: 18px; - font-weight: bold; - color: #5a728a; + &::placeholder { + font-family: 'Open Sans'; + font-size: 18px; + font-weight: bold; + color: #C6CBD0; + } } } diff --git a/apps/sales/src/assets/images/Check_89949E.svg b/apps/sales/src/assets/images/Check_89949E.svg new file mode 100644 index 000000000..7b048fa7b --- /dev/null +++ b/apps/sales/src/assets/images/Check_89949E.svg @@ -0,0 +1,11 @@ + + + + Check Copy 2 + Created with Sketch. + + + + + + diff --git a/apps/sales/src/assets/images/Icon_Abholfach_B.svg b/apps/sales/src/assets/images/Icon_Abholfach_B.svg index 0a3ac5fbc..8ee82abd8 100644 --- a/apps/sales/src/assets/images/Icon_Abholfach_B.svg +++ b/apps/sales/src/assets/images/Icon_Abholfach_B.svg @@ -4,10 +4,10 @@ Abholfach Icon Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/Icon_Abholfach_B_inactive.svg b/apps/sales/src/assets/images/Icon_Abholfach_B_inactive.svg index 10ea956a2..2465fc362 100644 --- a/apps/sales/src/assets/images/Icon_Abholfach_B_inactive.svg +++ b/apps/sales/src/assets/images/Icon_Abholfach_B_inactive.svg @@ -4,10 +4,10 @@ Abholfach Icon Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/Icon_Remission.svg b/apps/sales/src/assets/images/Icon_Remission.svg index 610ca23b4..7d73d446b 100644 --- a/apps/sales/src/assets/images/Icon_Remission.svg +++ b/apps/sales/src/assets/images/Icon_Remission.svg @@ -15,24 +15,24 @@ - - + + - + - + - - + + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/Icon_Remission_inactive.svg b/apps/sales/src/assets/images/Icon_Remission_inactive.svg index fe41e717f..f2c501db9 100644 --- a/apps/sales/src/assets/images/Icon_Remission_inactive.svg +++ b/apps/sales/src/assets/images/Icon_Remission_inactive.svg @@ -15,24 +15,24 @@ - - + + - + - + - - + + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/Icon_Tatigkeitskalender.svg b/apps/sales/src/assets/images/Icon_Tatigkeitskalender.svg index 15534c3ef..640403a22 100644 --- a/apps/sales/src/assets/images/Icon_Tatigkeitskalender.svg +++ b/apps/sales/src/assets/images/Icon_Tatigkeitskalender.svg @@ -4,10 +4,10 @@ Shape Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/Icon_Tatigkeitskalender_inactive.svg b/apps/sales/src/assets/images/Icon_Tatigkeitskalender_inactive.svg new file mode 100644 index 000000000..1134a4a1e --- /dev/null +++ b/apps/sales/src/assets/images/Icon_Tatigkeitskalender_inactive.svg @@ -0,0 +1,13 @@ + + + + Shape + Created with Sketch. + + + + + + + + diff --git a/apps/sales/src/assets/images/tag_body_grey.svg b/apps/sales/src/assets/images/tag_body_grey.svg new file mode 100644 index 000000000..c86a1d317 --- /dev/null +++ b/apps/sales/src/assets/images/tag_body_grey.svg @@ -0,0 +1,26 @@ + + + + Group 3 Copy 2 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/sales/src/assets/images/tag_icon_preorder_grey.svg b/apps/sales/src/assets/images/tag_icon_preorder_grey.svg new file mode 100644 index 000000000..c1f45f592 --- /dev/null +++ b/apps/sales/src/assets/images/tag_icon_preorder_grey.svg @@ -0,0 +1,17 @@ + + + + Bookmark / Preorder + Created with Sketch. + + + + + + + + + + + + diff --git a/apps/sales/src/assets/scss/_variables.scss b/apps/sales/src/assets/scss/_variables.scss index 976bddd32..7b94ce96c 100644 --- a/apps/sales/src/assets/scss/_variables.scss +++ b/apps/sales/src/assets/scss/_variables.scss @@ -1,8 +1,8 @@ /* constants declaration */ $color-active: #1f466c; $color-inactive: #557596; -$branch-color-active: #000000; -$branch-color-inactive: #596470; +$branch-color-active: #596470; +$branch-color-inactive: #EDEFF0; $hima-content-color: #e6eff9; $hima-branch-content-color: #edeff0; $hima-content-shadow-color: #dde5ec; diff --git a/libs/ui/src/lib/button/button.component.scss b/libs/ui/src/lib/button/button.component.scss index b33970bd0..5e15cc8f1 100644 --- a/libs/ui/src/lib/button/button.component.scss +++ b/libs/ui/src/lib/button/button.component.scss @@ -118,7 +118,7 @@ button.load span { } .disabled { - background-color: #9cb1c6 !important; + background-color: #89949E !important; } .secondary-disabled { diff --git a/libs/ui/src/lib/date-picker/date-picker.component.scss b/libs/ui/src/lib/date-picker/date-picker.component.scss index c0f0b1446..2f93217c6 100644 --- a/libs/ui/src/lib/date-picker/date-picker.component.scss +++ b/libs/ui/src/lib/date-picker/date-picker.component.scss @@ -53,7 +53,7 @@ color: #000000; height: 32px; width: 42px; - background-color: #d5d9dd; + background-color: #C6CBD0; position: absolute; margin-top: -10px; padding-top: 10px; diff --git a/libs/ui/src/lib/search-input/search-input.component.scss b/libs/ui/src/lib/search-input/search-input.component.scss index d4c608cdb..c73f8531e 100644 --- a/libs/ui/src/lib/search-input/search-input.component.scss +++ b/libs/ui/src/lib/search-input/search-input.component.scss @@ -15,7 +15,7 @@ align-items: center; &.branch { - border: 1.5px solid #89949e; + border: 1.5px solid #C6CBD0; } } @@ -125,7 +125,7 @@ } .placeholder-branch::placeholder { - color: #596470; + color: #C6CBD0; } .error-message { diff --git a/libs/ui/src/lib/tag/tag.component.html b/libs/ui/src/lib/tag/tag.component.html index c417f89e0..2edd6aefe 100644 --- a/libs/ui/src/lib/tag/tag.component.html +++ b/libs/ui/src/lib/tag/tag.component.html @@ -1,6 +1,6 @@
- +
diff --git a/libs/ui/src/lib/tag/tag.component.scss b/libs/ui/src/lib/tag/tag.component.scss index 1d90ac819..f28c7067a 100644 --- a/libs/ui/src/lib/tag/tag.component.scss +++ b/libs/ui/src/lib/tag/tag.component.scss @@ -1,20 +1,27 @@ +$colorSelected: #89949E; +$colorSelectedNot: #EDEFF0; + .wrapper { display: flex; flex-direction: row; padding: 6px 15px 6px 8px; align-content: center; - border: 1.5px solid #cfd4d8; + border: 1.5px solid $colorSelectedNot; border-radius: 30px; cursor: pointer; + &.selected { + border-color: $colorSelected; + } + .img { - border: 1.5px solid #cfd4d8; + border: 1.5px solid $colorSelectedNot; border-radius: 100%; width: 21px; height: 21px; &.selected { - border: 1.5px solid #ffffff; + border-color: $colorSelected; } lib-icon { @@ -25,11 +32,15 @@ .text { font-size: 16px; - color: #cfd4d8; + color: $colorSelectedNot; padding-top: 3px; padding-left: 10px; position: relative; bottom: 2px; + + &.selected { + color: $colorSelected; + } } } @@ -37,23 +48,17 @@ input { border: none; font-size: 16px; width: 90px; - color: #cfd4d8; - caret-color: #cfd4d8; + color: $colorSelectedNot; + caret-color: $colorSelectedNot; padding: 0; &.selected { - color: #ffffff; - caret-color: #ffffff; - background-color: #d5d9dd; + color: $colorSelected; + caret-color: $colorSelected; + //background-color: #d5d9dd; } } input:focus { outline: none; } - -.selected { - background-color: #d5d9dd; - border-color: #d5d9dd; - color: #ffffff !important; -} From b0e7d91e40dc42ce7ffc392901b678349e0fab41 Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Fri, 31 Jan 2020 12:41:12 +0100 Subject: [PATCH 05/13] HIMA-782 Kunden style adjustments --- apps/sales/src/assets/images/OF_Icon_AU.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_DL.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_EB.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_HC.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_KA.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_MA.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_NB.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_SW.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_TB.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_VI.svg | 4 ++-- apps/sales/src/assets/images/OF_Icon_ZS.svg | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/sales/src/assets/images/OF_Icon_AU.svg b/apps/sales/src/assets/images/OF_Icon_AU.svg index f6f1254b6..fb6192e05 100644 --- a/apps/sales/src/assets/images/OF_Icon_AU.svg +++ b/apps/sales/src/assets/images/OF_Icon_AU.svg @@ -4,8 +4,8 @@ Headphone Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_DL.svg b/apps/sales/src/assets/images/OF_Icon_DL.svg index f6f1254b6..fb6192e05 100644 --- a/apps/sales/src/assets/images/OF_Icon_DL.svg +++ b/apps/sales/src/assets/images/OF_Icon_DL.svg @@ -4,8 +4,8 @@ Headphone Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_EB.svg b/apps/sales/src/assets/images/OF_Icon_EB.svg index 3f2215fc0..a47b7dfbd 100644 --- a/apps/sales/src/assets/images/OF_Icon_EB.svg +++ b/apps/sales/src/assets/images/OF_Icon_EB.svg @@ -4,8 +4,8 @@ E-Book Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_HC.svg b/apps/sales/src/assets/images/OF_Icon_HC.svg index 6e316c23a..7adc9564b 100644 --- a/apps/sales/src/assets/images/OF_Icon_HC.svg +++ b/apps/sales/src/assets/images/OF_Icon_HC.svg @@ -4,8 +4,8 @@ Icon_HC Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_KA.svg b/apps/sales/src/assets/images/OF_Icon_KA.svg index 3644b02eb..55605d338 100644 --- a/apps/sales/src/assets/images/OF_Icon_KA.svg +++ b/apps/sales/src/assets/images/OF_Icon_KA.svg @@ -4,8 +4,8 @@ Calender Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_MA.svg b/apps/sales/src/assets/images/OF_Icon_MA.svg index 8ef6a68a0..757c49e3c 100644 --- a/apps/sales/src/assets/images/OF_Icon_MA.svg +++ b/apps/sales/src/assets/images/OF_Icon_MA.svg @@ -4,8 +4,8 @@ Icon_MA Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_NB.svg b/apps/sales/src/assets/images/OF_Icon_NB.svg index 357adde36..fa6d6272d 100644 --- a/apps/sales/src/assets/images/OF_Icon_NB.svg +++ b/apps/sales/src/assets/images/OF_Icon_NB.svg @@ -4,8 +4,8 @@ Icon_NB Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_SW.svg b/apps/sales/src/assets/images/OF_Icon_SW.svg index 903417ab0..7290c6d66 100644 --- a/apps/sales/src/assets/images/OF_Icon_SW.svg +++ b/apps/sales/src/assets/images/OF_Icon_SW.svg @@ -4,8 +4,8 @@ Icon_SW Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_TB.svg b/apps/sales/src/assets/images/OF_Icon_TB.svg index 5dbc12b91..6545d86b6 100644 --- a/apps/sales/src/assets/images/OF_Icon_TB.svg +++ b/apps/sales/src/assets/images/OF_Icon_TB.svg @@ -4,8 +4,8 @@ Book Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_VI.svg b/apps/sales/src/assets/images/OF_Icon_VI.svg index bb88ca3e9..1586f3157 100644 --- a/apps/sales/src/assets/images/OF_Icon_VI.svg +++ b/apps/sales/src/assets/images/OF_Icon_VI.svg @@ -4,8 +4,8 @@ Icon_VI Created with Sketch. - + - \ No newline at end of file + diff --git a/apps/sales/src/assets/images/OF_Icon_ZS.svg b/apps/sales/src/assets/images/OF_Icon_ZS.svg index 98ae983a6..7d4d02d66 100644 --- a/apps/sales/src/assets/images/OF_Icon_ZS.svg +++ b/apps/sales/src/assets/images/OF_Icon_ZS.svg @@ -4,8 +4,8 @@ Icon_ZS Created with Sketch. - + - \ No newline at end of file + From 2bbac4041d8c9594e02713629e84cb45fbebf9fc Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Fri, 31 Jan 2020 13:39:03 +0100 Subject: [PATCH 06/13] HIMA-848 Error message modal added for callback error returned. --- .../barcode-search/barcode-search.module.ts | 3 +- ...mer-card-search-error-modal.component.html | 15 ++++++++++ ...mer-card-search-error-modal.component.scss | 26 +++++++++++++++++ ...-card-search-error-modal.component.spec.ts | 25 ++++++++++++++++ ...tomer-card-search-error-modal.component.ts | 29 +++++++++++++++++++ ...ustomer-card-barcode-search.component.html | 1 + .../customer-card-barcode-search.component.ts | 6 ++++ 7 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.html create mode 100644 apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.scss create mode 100644 apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.spec.ts create mode 100644 apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.ts diff --git a/apps/sales/src/app/modules/barcode-search/barcode-search.module.ts b/apps/sales/src/app/modules/barcode-search/barcode-search.module.ts index eb066b1c3..e57cf1c7d 100644 --- a/apps/sales/src/app/modules/barcode-search/barcode-search.module.ts +++ b/apps/sales/src/app/modules/barcode-search/barcode-search.module.ts @@ -12,6 +12,7 @@ import { BarcodeScannerModule, CustomerCardScannerModule } from 'shared/public_a import { CustomerCardBarcodeSearchComponent } from './pages/customer-card-barcode-search/customer-card-barcode-search.component'; import { CustomerCardManualEntryComponent } from './components/customer-card-manual-entry/customer-card-manual-entry.component'; import { FormsModule } from '@angular/forms'; +import { CustomerCardSearchErrorModalComponent } from './components/customer-card-search-error-modal/customer-card-search-error-modal.component'; @NgModule({ imports: [ @@ -35,6 +36,6 @@ import { FormsModule } from '@angular/forms'; BarcodeScannerModule, BarcodeScannerComponent ], - declarations: [BarcodeSearchComponent, BarcodeScannerComponent, CustomerCardBarcodeSearchComponent, CustomerCardManualEntryComponent] + declarations: [BarcodeSearchComponent, BarcodeScannerComponent, CustomerCardBarcodeSearchComponent, CustomerCardManualEntryComponent, CustomerCardSearchErrorModalComponent] }) export class BarcodeSearchModule {} diff --git a/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.html b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.html new file mode 100644 index 000000000..675c2c212 --- /dev/null +++ b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.html @@ -0,0 +1,15 @@ + + + +
+
{{title}}
+ +
{{message}}
+ +
+ Zur Kundensuche + +
+
+ diff --git a/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.scss b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.scss new file mode 100644 index 000000000..f7026d65a --- /dev/null +++ b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.scss @@ -0,0 +1,26 @@ +lib-icon { + position: absolute; + top: 20px; + right: 20px; +} + +.modal-wrapper { + width: 50%; + min-width: 300px; + margin: 0 auto; + text-align: center; + + .header { + font-size: 22px; + font-weight: bold; + margin: 35px 0 15px 0; + } + + .content { + margin: 15px 0; + } + + .actions { + margin: 35px 0; + } +} diff --git a/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.spec.ts b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.spec.ts new file mode 100644 index 000000000..700a820df --- /dev/null +++ b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CustomerCardSearchErrorModalComponent } from './customer-card-search-error-modal.component'; + +describe('CustomerCardSearchErrorModalComponent', () => { + let component: CustomerCardSearchErrorModalComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CustomerCardSearchErrorModalComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CustomerCardSearchErrorModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.ts b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.ts new file mode 100644 index 000000000..11f1ee605 --- /dev/null +++ b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.ts @@ -0,0 +1,29 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalService } from '@libs/ui'; + +@Component({ + selector: 'app-customer-card-search-error-modal', + templateUrl: './customer-card-search-error-modal.component.html', + styleUrls: ['./customer-card-search-error-modal.component.scss'] +}) +export class CustomerCardSearchErrorModalComponent implements OnInit { + id = 'customer-card-search-error-modal'; + title: string; + message: string; + + constructor( + private modalService: ModalService + ) {} + + ngOnInit() {} + + openDialog(title, message) { + this.title = title; + this.message = message; + this.modalService.open(this.id); + } + + closeDialog() { + this.modalService.close(this.id); + } +} diff --git a/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.html b/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.html index 51405f7d2..8a109c299 100644 --- a/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.html +++ b/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.html @@ -5,4 +5,5 @@ +
diff --git a/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.ts b/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.ts index ab02f45e6..f0db4474e 100644 --- a/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.ts +++ b/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.ts @@ -14,6 +14,9 @@ import { CustomerService } from 'apps/sales/src/app/core/services/customer.servi import { WindowRef } from 'apps/sales/src/app/core/services/window-ref.service'; import { CustomerInfoDTO } from 'swagger/lib/crm/models/customer-info-dto'; import { CustomerCardManualEntryComponent } from '../../components/customer-card-manual-entry/customer-card-manual-entry.component'; +import { + CustomerCardSearchErrorModalComponent +} from '../../components/customer-card-search-error-modal/customer-card-search-error-modal.component'; @Component({ selector: 'app-customer-card-barcode-search', @@ -23,6 +26,7 @@ import { CustomerCardManualEntryComponent } from '../../components/customer-card export class CustomerCardBarcodeSearchComponent implements OnInit, OnDestroy, AfterViewInit { @ViewChild('scanner') scanner: CustomerCardScannerScanditComponent; @ViewChild('manualentry') manualentry: CustomerCardManualEntryComponent; + @ViewChild('searchCardErrorModal') searchCardErrorModal: CustomerCardSearchErrorModalComponent; @Select(ProcessSelectors.getProcesses) processes$: Observable; processes: Process[] = []; destroy$ = new Subject(); @@ -92,6 +96,8 @@ export class CustomerCardBarcodeSearchComponent implements OnInit, OnDestroy, Af } else { this.scanner.scanToggle(); } + }, e => { + this.searchCardErrorModal.openDialog(`${e.status} ${e.statusText}`, e.message); }); } From 2db5926cdb85f7f4614346339f52f3ca02e54e7e Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Tue, 21 Jan 2020 09:37:29 +0100 Subject: [PATCH 07/13] HIMA-914 picture gallery image slide out style adjustment --- libs/ui/src/lib/photo-gallery/photo-gallery.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/ui/src/lib/photo-gallery/photo-gallery.component.scss b/libs/ui/src/lib/photo-gallery/photo-gallery.component.scss index 91de5e706..e8189e956 100644 --- a/libs/ui/src/lib/photo-gallery/photo-gallery.component.scss +++ b/libs/ui/src/lib/photo-gallery/photo-gallery.component.scss @@ -5,6 +5,7 @@ display: flex; align-items: center; flex-direction: column; + overflow-x: hidden; .header { .close-icon { From b2f207c6e00de695bba35fb6d0f2f6352a7fe8bd Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Mon, 3 Feb 2020 00:41:22 +0100 Subject: [PATCH 08/13] HIMA-899 cart item quantity style adjustments --- .../delete-dropdown.component.html | 25 +++++++++++-------- .../delete-dropdown.component.scss | 18 +++++++++++-- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/libs/ui/src/lib/delete-dropdown/delete-dropdown.component.html b/libs/ui/src/lib/delete-dropdown/delete-dropdown.component.html index 78df2cde5..e4282a0bb 100644 --- a/libs/ui/src/lib/delete-dropdown/delete-dropdown.component.html +++ b/libs/ui/src/lib/delete-dropdown/delete-dropdown.component.html @@ -26,6 +26,20 @@
@@ -55,7 +59,6 @@ img { + position: absolute; + top: 50px; + right: 15px; + z-index: 1; + } + } + .img { height: 9px; width: 17px; @@ -144,7 +157,8 @@ flex-direction: row; input { - width: 40px; + width: 30px; + padding-left: 10px; font-size: 16px; color: #000000; caret-color: #f70400; From 4bdf34c9c8bf492ba6a99cb9617ce47b6f7ab1b4 Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Tue, 4 Feb 2020 09:57:38 +0100 Subject: [PATCH 09/13] HIMA-751 Artikelsuche scroll style adjustments --- .../pages/product-results/product-results.component.html | 5 ++++- .../pages/product-results/product-results.component.scss | 2 +- apps/sales/src/styles.scss | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/sales/src/app/modules/product/pages/product-results/product-results.component.html b/apps/sales/src/app/modules/product/pages/product-results/product-results.component.html index 9bc447402..aa25e675d 100644 --- a/apps/sales/src/app/modules/product/pages/product-results/product-results.component.html +++ b/apps/sales/src/app/modules/product/pages/product-results/product-results.component.html @@ -17,7 +17,10 @@
Keine Suchergebnisse gefunden
- +
Date: Tue, 4 Feb 2020 12:01:10 +0100 Subject: [PATCH 10/13] HIMA-425 customer form country list height adjustment --- .../create-customer-card/create-customer-card.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.html b/apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.html index 470949804..61e630dc6 100644 --- a/apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.html +++ b/apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.html @@ -253,7 +253,7 @@ [error]="submitted && f.country.errors" [errorMessage]="f.city.errors && f.city.errors.backendValidation ? f.city.errors.backendValidationMsg : 'Land wird benötigt'" [value]="f.country.value" - [maxheight]="'255px'" + [maxheight]="'360px'" [scroll]="true" #landDD > From 1f911b06a8181e47d789721e0e432c3d217bd197 Mon Sep 17 00:00:00 2001 From: Mikuta Aleksandras Date: Tue, 4 Feb 2020 12:41:02 +0100 Subject: [PATCH 11/13] HIMA-751 Lists scroll style adjustments --- .../customer-search-result.component.html | 2 +- .../customer-search-result.component.scss | 4 ++-- .../goods-in-search-results.component.html | 2 +- .../goods-in-search-results.component.scss | 11 +++-------- .../shelf-search-results.component.html | 2 +- .../shelf-search-results.component.scss | 5 ++--- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html b/apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html index 6166e392d..fab40f2fb 100644 --- a/apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html +++ b/apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html @@ -39,7 +39,7 @@ Neue Kundendaten erfassen
- +