sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/customer_pages'

Browse Source 
Conflicts:
	apps/sales/src/app/app.component.html
	apps/sales/src/app/components/printer-selection/printer-selection.component.html
	apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.ts
	apps/sales/src/app/modules/shelf/components/order-item-details/order-item-details.component.html
	apps/sales/src/app/modules/shelf/services/shelf-abholfachetikett.service.ts
	apps/swagger/oms/src/lib/models/branch-dto.ts
	apps/swagger/oms/src/lib/models/display-order-dto.ts
	apps/swagger/oms/src/lib/models/display-order-item-dto.ts
	apps/swagger/oms/src/lib/models/display-order-item-subset-dto.ts
	apps/swagger/oms/src/lib/models/display-order-payment-dto.ts
	apps/swagger/oms/src/lib/models/order-item-list-item-dto.ts
	apps/swagger/oms/src/lib/models/order-list-item-dto.ts
	apps/swagger/oms/src/lib/models/order-query-token-dto.ts
	apps/swagger/oms/src/lib/models/receipt-list-item-dto.ts
This commit is contained in:
Lorenz Hilpert
2021-02-05 18:09:35 +01:00
parent 42e6a8caaa 37c6abf4f0
commit 14645a2ec1
1152 changed files with 35547 additions and 20413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,5 +1,5 @@
#stage 1
FROM node:10-stretch as node
FROM node:14 as node
ARG IS_PRODUCTION=false
ARG SEMVERSION=1.0.0
ARG BuildUniqueID