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

Frontend orders/number #13

Merged
bilal.catic merged 53 commits from frontend-orders/number into master 2018-08-29 13:06:02 +02:00
Conversation 23 Commits 53 Files Changed 35 +11 -18
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04c7a7536f - Show all commits

29
frontend/src/actions/orders/customerAcceptanceActions.js
View File

@@ -23,15 +23,12 @@ const recieveCustomerAcceptance = (json) => ({
customerAcceptance: json
});
export const fetchCustomerAcceptance = (idOrder) => {
export const fetchCustomerAcceptance = (idEntry) => {
return dispatch => {
dispatch(requestCustomerAcceptance());
return htmlClient.fetch({
url: `${API_SERVER}/orders/api/getCustomerAcceptance`,
method: 'post',
data: {
idOrder
}
url: `${API_SERVER}/wp-json/wiaas/customer-acceptance/${idEntry}`,
method: 'get'
})
.then(response => {
if (response.data) {
@@ -48,18 +45,15 @@ const uploadAcceptanceAction = () => ({
type: UPLOAD_CUSTOMER_ACCEPTANCE
});
export const uploadAcceptance = (idOrder, file) => {
export const uploadAcceptance = (idEntry, file) => {
return dispatch => {
dispatch(uploadAcceptanceAction());
return htmlClient.uploadFile(file, {
url: `${API_SERVER}/orders/api/uploadAcceptanceDocument`,
data: {
idOrder
}
url: `${API_SERVER}/wp-json/wiaas/customer-acceptance/${idEntry}/upload-file`
}).then(response => {
if (typeof response.data !== 'undefined' && 'messages' in response.data) {
dispatch(updateMessages(response.data.messages, orderMessages));
dispatch(fetchCustomerAcceptance(idOrder));
if (typeof response.data !== 'undefined') {
//dispatch(updateMessages(response.data.messages, orderMessages));
dispatch(fetchCustomerAcceptance(idEntry));
}
}).catch(error => {
htmlClient.onError(error, dispatch);
@@ -77,14 +71,13 @@ const sendCustomerAcceptance = () => ({
type: SEND_CUSTOMER_ACCEPTANCE
});
export const acceptDeclineInstallation = (idOrder, actionType, declineReason) => {
export const acceptDeclineInstallation = (idEntry, actionType, declineReason) => {
return dispatch => {
dispatch(sendCustomerAcceptance());
return htmlClient.fetch({
url: `${API_SERVER}/orders/api/acceptDeclineInstallation`,
url: `${API_SERVER}/wp-json/wiaas/customer-acceptance/${idEntry}`,
method: 'post',
data: {
idOrder,
actionType,
declineReason
}
@@ -92,7 +85,7 @@ export const acceptDeclineInstallation = (idOrder, actionType, declineReason) =>
.then(response => {
if (response.data) {
dispatch(updateMessages(response.data.messages, orderMessages));
dispatch(fetchCustomerAcceptance(idOrder));
dispatch(fetchCustomerAcceptance(idEntry));
}
})
.catch(error => {