From 8b5374ee2403f8c6bd097e606a5f5a1a0bc852b1 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Tue, 14 Aug 2018 23:31:12 +0200 Subject: [PATCH] change endpoints for order details, comments and documents --- frontend/src/actions/orders/processActions.js | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/frontend/src/actions/orders/processActions.js b/frontend/src/actions/orders/processActions.js index 9ea9ce4..922a218 100644 --- a/frontend/src/actions/orders/processActions.js +++ b/frontend/src/actions/orders/processActions.js @@ -24,7 +24,9 @@ import { SET_SCHEDULING_DISABLED_FLAG } from '../../constants/ordersConstants'; import HtmlClient from '../../helpers/HtmlClient'; -import {updateMessages} from '../notification/notificationActions'; +import { updateMessages } from '../notification/notificationActions'; +import { fromWCOrder } from '../../helpers/OrderHelper'; +import moment from 'moment'; const htmlClient = new HtmlClient(); @@ -42,15 +44,12 @@ export const fetchOrderInfo = (idOrder) => { return dispatch => { dispatch(requestOrderInfo()); return htmlClient.fetch({ - url: `${API_SERVER}/orders/api/getOrderInfo`, - method: 'post', - data: { - idOrder - } - }) + url: `${API_SERVER}/wp-json/wc/v2/orders/${idOrder}`, + method: 'get' + }) .then(response => { if (response.data) { - dispatch(recieveOrderInfo(response.data)); + dispatch(recieveOrderInfo(fromWCOrder(response.data))); } }) .catch(error => { @@ -66,19 +65,34 @@ const sendComment = () => ({ export const addComment = (idOrder, comment) => { return dispatch => { dispatch(sendComment()); + //TODO: get real user name and store in comment object return htmlClient.fetch({ - url: `${API_SERVER}/orders/api/addOrderComment`, - method: 'post', - data: { - idOrder, - comment - } - }) + url: `${API_SERVER}/wp-json/wc/v2/orders/${idOrder}`, + method: 'post', + data: { + meta_data: [ + { + key: `comment-${moment().unix()}`, + value: { + comment: comment, + addDate: moment().format("Do MMM, YY"), + username: 'username', + isOwner: 1 + } + } + ] + } + }) .then(response => { + if (response.data) { + dispatch(fetchOrderInfo(idOrder)); + } + /* if (response.data && response.data.messages) { dispatch(updateMessages(response.data.messages, orderMessages)); dispatch(fetchOrderInfo(idOrder)); } + */ }) .catch(error => { htmlClient.onError(error, dispatch);