From 375fcb80a7e24aa2b2cd2a50aa6b26650dcdba13 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Wed, 8 Aug 2018 16:46:14 +0200 Subject: [PATCH] change object properties to more readable ones --- .../class-wiaas-rest-delivery-process-api.php | 6 ++-- frontend/src/helpers/OrderHelper.js | 15 ++++++++++ frontend/src/helpers/SaburlyAdapter.js | 28 ------------------- 3 files changed, 18 insertions(+), 31 deletions(-) create mode 100644 frontend/src/helpers/OrderHelper.js delete mode 100644 frontend/src/helpers/SaburlyAdapter.js diff --git a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-delivery-process-api.php b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-delivery-process-api.php index 461a51d..5a8d493 100644 --- a/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-delivery-process-api.php +++ b/backend/app/plugins/wiaas/includes/api/class-wiaas-rest-delivery-process-api.php @@ -51,10 +51,10 @@ class Wiass_REST_Delivery_Process_API { foreach ($entries as $entry) { $step = gravity_flow()->get_step( $entry['workflow_step'] ); $data[] = array( - 'idOrder' => $entry['wiaas_delivery_order_id'], - 'orderNumber' => $entry['wiaas_delivery_order_id'], + 'order_id' => $entry['wiaas_delivery_order_id'], + 'order_number' => $entry['wiaas_delivery_order_id'], 'status' => $entry['workflow_final_status'], - 'stepAction' => $step->get_name(), + 'step_action' => $step->get_name(), ); } diff --git a/frontend/src/helpers/OrderHelper.js b/frontend/src/helpers/OrderHelper.js new file mode 100644 index 0000000..862c8ec --- /dev/null +++ b/frontend/src/helpers/OrderHelper.js @@ -0,0 +1,15 @@ +import moment from 'moment'; + +export const fromWCOrder = (order) => { + return { + id: order.id, + number: order.number, + dateCreated: moment(order.date_created).format("Do MMM, YYYY"), + reference: 'reference field', + assignedTo: 'assigned to', + fixedPrice: order.total, + recurringPrice: 0, + status: order.status, + currency: order.currency + } +} \ No newline at end of file diff --git a/frontend/src/helpers/SaburlyAdapter.js b/frontend/src/helpers/SaburlyAdapter.js deleted file mode 100644 index e1a0d13..0000000 --- a/frontend/src/helpers/SaburlyAdapter.js +++ /dev/null @@ -1,28 +0,0 @@ -import moment from 'moment'; - -const transformOrderInArray = (order) => { - let newOrderObject = { - idOrder: order.id, - orderNumber: order.number, - orderDate: moment(order.date_created).format("Do MMM, YYYY"), - reference: 'reference field', - assignedTo: 'assigned to', - fixedPrice: order.total, - recurringPrice: 0, - status: order.status, - currency: order.currency - } - return newOrderObject; -} - -class SaburlyAdapter { - - transformOrdersArray(orders) { - return orders.map(order => { - return transformOrderInArray(order); - }); - }; - -} - -export default SaburlyAdapter; \ No newline at end of file