Commit Graph

3859 Commits

Author SHA1 Message Date
Eraldo Hasanaj
30a6b23266 [HIMA-1086] fixed issue with versand delivery addres in the cart was not changing when navigating beeetwen tabs 2020-03-05 12:14:23 +01:00
Eraldo Hasanaj
b296b5a43b [HIMA-873] updated the implementation for adding the remission items to shipping document because of library update (UPDATE) 2020-03-05 11:34:21 +01:00
Eraldo Hasanaj
f78164b03e [HIMA-873] updated the implementation for adding the remission items to shipping document because of library update (UPDATE) 2020-03-05 11:33:24 +01:00
Eraldo Hasanaj
300601052d Merge branch 'develop' of https://bitbucket.org/umwerk/hugendubel-instore-ma into develop 2020-03-05 11:00:26 +01:00
Eraldo Hasanaj
1f22518f95 [HIMA-880] fixed issue with showing payment data on customer order details 2020-03-05 10:59:06 +01:00
Aleksandras Mikuta
763f661d25 Merged in bugfix/HIMA-1160-remission-list-item-style (pull request #1179)
Bugfix/HIMA-1160 remission list item style
2020-03-05 08:21:23 +00:00
Sebastian
3195012e92 Merge branch 'develop' into HIMA-1031-continue-uncompleted-shipping-docs 2020-03-05 08:48:12 +01:00
Sebastian
f762d8ebae [Remission Details Page] - Add Printing (incl. Error Handling) 2020-03-04 17:58:28 +01:00
Mikuta Aleksandras
5cfc9c8a99 build-prod changes 2020-03-04 17:05:51 +01:00
Mikuta Aleksandras
1277271a9f [HIMA-1160] remission list card started restmenge style adjustments 2020-03-04 16:52:56 +01:00
Sebastian
cfe2fe03c1 [Remission Details Page - Product Details] - Reduce Padding on Products 2020-03-04 16:23:31 +01:00
Sebastian
b0e6c75aec [Remission Details Page - Product Details] - Add Product Details Styling 2020-03-04 16:12:55 +01:00
Eraldo Hasanaj
010b22a943 [HIMA-1086] fixed issue in the cart when switching tabs and the customer address info was not updated in the UI 2020-03-04 13:24:54 +01:00
Sebastian
e3685fe72a [Remission Details Page] - Add Navigation from Overview Page 2020-03-04 11:46:39 +01:00
Eraldo Hasanaj
1ab227aab7 [HIMA-873] updated library and implementation for handeling errors from the library 2020-03-04 11:33:41 +01:00
Sebastian
fe1d9b0416 [Remission Overview Page] - Add Content + Styling 2020-03-04 11:12:51 +01:00
Aleksandras Mikuta
55449338c3 Merged in bugfix/HIMA-1160-remission-list-item-style (pull request #1177)
[HIMA-1160] remission list card started restmenge style adjustments
2020-03-04 09:18:07 +00:00
Sebastian
74f28aa0a5 [Remision Overview Page] - Add Header incl. Styling 2020-03-04 09:50:49 +01:00
Mikuta Aleksandras
170cc1f848 [HIMA-1160] remission list card started restmenge style adjustments 2020-03-04 08:58:30 +01:00
Sebastian
d97493951a [Remission Overview Page] - Fetch all remissions (last 7 days) 2020-03-03 17:58:23 +01:00
Sebastian
e0c42b1a6a [Remission Overview] - Add Header Styling 2020-03-03 17:29:33 +01:00
Sebastian
b0399514c1 Add Remission Overview Page incl. Navigation 2020-03-03 17:16:55 +01:00
Sebastian
17ba74a163 Add Icon for Open Remission Indicator 2020-03-03 16:23:52 +01:00
Sebastian
04d398f084 Show open shipping documents on create page 2020-03-03 16:13:21 +01:00
Eraldo Hasanaj
1b79caa407 [HIMA-1156] customer order now all rucklage items aore editable 2020-03-03 14:51:33 +01:00
Sebastian
43ce0c48aa [Remission List Create] - Fetch Uncompleted Remissions 2020-03-03 14:50:58 +01:00
Sebastian
bc9a3d8b73 Add Remission State existingRemissions plus Actions 2020-03-03 14:31:17 +01:00
s.neumair
d2204154d2 Merged in 1033-cherrypick-prior-commits (pull request #1176)
Delete Shipping Document (HIMA-1033)
2020-03-03 13:04:11 +00:00
Eraldo Hasanaj
51b5ae6459 [HIMA-880] update customer order details payment data 2020-03-03 13:04:48 +01:00
Sebastian
5e7490abe1 Resolve mege conflicts in remission-list-started and remission-shipping-document 2020-03-03 12:50:34 +01:00
Sebastian
b6b2a66be9 UI Lib - Button - HTML and Styling for rightAlign
Additional input param rightAlign
2020-03-03 12:06:06 +01:00
Sebastian
297bf9df08 UI Lib: Button - Additional input param rightAlign
Additional input param to right align button (default=false). Removes padding-right of button if true.
2020-03-03 12:05:43 +01:00
Sebastian
6a2fe9ce4d Resolve merge conflicts in import order 2020-03-03 12:05:21 +01:00
Sebastian Neumair
2c93ce46d3 Fix merge conflicts in generate shipping doc 2020-03-03 12:03:08 +01:00
Sebastian Neumair
4190a85b46 Resolve Merge Conflicts in Remisison List Started 2020-03-03 11:55:32 +01:00
Eraldo Hasanaj
57701e6767 [HIMA-873] fixed problem with error message not being displayed when adding remission item to shipping document 2020-03-03 11:37:29 +01:00
Eraldo Hasanaj
6fbd3091b8 Merge branch 'feature/HIMA-1043-pastuck-id' into develop 2020-03-03 11:01:17 +01:00
Eraldo Hasanaj
77bcb82fb0 [HIMA-1043] updated libraries & handled errors thrown when scanning postuck id 2020-03-03 11:00:40 +01:00
Lorenz Hilpert
817b2da263 Merge branch 'develop' of https://bitbucket.org/umwerk/hugendubel-instore-ma into develop 2020-03-03 10:45:55 +01:00
Lorenz Hilpert
bfa72d037e Config Update Stagng Production 2020-03-03 10:45:47 +01:00
Eraldo Hasanaj
20fdc81aa8 Merged in revert-pr-1174 (pull request #1175)
Revert "HIMA-1033 delete shipping document (pull request #1174)"
2020-03-03 09:39:59 +00:00
Eraldo Hasanaj
7c64743257 Revert "HIMA-1033 delete shipping document (pull request #1174)"
This reverts pull request #1174.

> * Add Delete Button and Confirmation Dialogue
> * Add Delete Shipping Document Dialog and create shipping document for started remissions without shipping document
> * Delete Shipping Document without previously completed Remissions
> * UI Lib: Button - Additional input param rightAlign
> 
>     Additional input param to right align button \(default=false\). Removes padding-right of button if true.
> 
> 
> * UI Lib - Button - HTML and Styling for rightAlign
> 
>     Additional input param rightAlign
> 
> 
> 
> ‌
2020-03-03 09:39:18 +00:00
Lorenz Hilpert
e63dd59404 Merge branch 'develop' of https://bitbucket.org/umwerk/hugendubel-instore-ma into develop 2020-03-03 10:24:38 +01:00
Lorenz Hilpert
18dfc8fa42 Staging and Production Config Change 2020-03-03 10:24:09 +01:00
s.neumair
16257992bc Merged in HIMA-1033-delete-shipping-document (pull request #1174)
HIMA-1033 delete shipping document
2020-03-02 16:24:08 +00:00
Sebastian
2d481236c3 Merge branch 'develop' into HIMA-1033-delete-shipping-document 2020-03-02 17:11:25 +01:00
Sebastian
617bc4f8fc UI Lib - Button - HTML and Styling for rightAlign
Additional input param rightAlign
2020-03-02 17:01:55 +01:00
Sebastian
91f83e6de2 UI Lib: Button - Additional input param rightAlign
Additional input param to right align button (default=false). Removes padding-right of button if true.
2020-03-02 17:00:27 +01:00
Sebastian
32aab3c2b2 HIMA-1033 - Delete Shipping Document without previously completed Remissions 2020-03-02 16:11:12 +01:00
Eraldo Hasanaj
4815bef80d [HIMA-1055] library update 2020-03-02 09:46:54 +01:00