senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'frontend-orders/number' of gitlab.com:saburly/wiaas/new-wiaas into frontend-orders/number

Browse Source
This commit is contained in:
Almira Krdzic
2018-08-29 11:37:35 +02:00
parent 057a99b8f5 2cb32dca31
commit fc98735434
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/containers/orders/components/process/CustomerAcceptance.jsx
View File

@@ -148,7 +148,7 @@ class CustomerAcceptance extends Component {
{
customerAcceptance.documents.map((document, index) => <div key={'acceptance-documnet-' + index}>
<span className="document-link">
<i className={'fa fa-file'}></i> <a href={document.url}> {document.name} ({document.extension}) </a>
<i className={'fa fa-file'}></i> <a target="_blank" href={document.url}> {document.name} ({document.extension}) </a>
</span>
<span className="document-status">
{document.validation} <div className={'status-icon ' + document.validation}></div>

4
frontend/src/containers/orders/components/process/ValidateQuestionnaire.jsx
View File

@@ -8,8 +8,8 @@ class ValidateQuestionnaire extends Component {
componentDidMount(){
const {idOrder, idProcessStep} = this.props.step;
this.props.dispatch(fetchCustomerDocuments(idOrder, 'orderQuestionaire'));
this.props.dispatch(fetchValidationComments(idOrder, idProcessStep, 'invalidQuestionnaireComment'));
//this.props.dispatch(fetchCustomerDocuments(idOrder, 'orderQuestionaire'));
//this.props.dispatch(fetchValidationComments(idOrder, idProcessStep, 'invalidQuestionnaireComment'));
}
findById(orderPackage, idOrderPackagePair){