diff --git a/frontend/src/actions/profileSettings/addressActions.js b/frontend/src/actions/profileSettings/addressActions.js index 39558d3..83cd000 100644 --- a/frontend/src/actions/profileSettings/addressActions.js +++ b/frontend/src/actions/profileSettings/addressActions.js @@ -13,6 +13,7 @@ import {updateMessages} from '../notification/notificationActions'; import {setDialogOpenFlag} from '../dialog/dialogActions'; import {recieveProfileInfo} from './profileSettingsActions'; import { fromWiaasProfileInfo } from '../../helpers/ProfileHelper'; +import { toWiaasAddress } from '../../helpers/AddressHelper'; const client = new HtmlClient(); @@ -27,7 +28,7 @@ export const saveProfileAddress = (idUser, profileAddress) => { url: `${API_SERVER}/wp-json/wiaas/customer/${idUser}/profile-addresses`, method: 'put', data: { - 'profile_address': JSON.stringify(profileAddress) + 'profile_address': JSON.stringify(toWiaasAddress(profileAddress)) } }) .then(response => { @@ -80,7 +81,7 @@ export const saveBillingAddress = (idUser, billingAddress) => { url: `${API_SERVER}/wp-json/wiaas/customer/${idUser}/billing-addresses`, method: 'put', data: { - 'billing_address': JSON.stringify(billingAddress) + 'billing_address': JSON.stringify(toWiaasAddress(billingAddress)) } }) .then(response => { diff --git a/frontend/src/helpers/AddressHelper.js b/frontend/src/helpers/AddressHelper.js new file mode 100644 index 0000000..abd9fac --- /dev/null +++ b/frontend/src/helpers/AddressHelper.js @@ -0,0 +1,29 @@ +export const fromWiaasAddress = (address) => { + return { + id: address.id, + countryName: address.country_name, + deliveryMail: address.delivery_mail, + idCountrySelected: address.id_country_selected, + city: address.city, + detailedAddress: address.detailed_address, + zipCode: address.zip_code, + firstName: address.first_name, + lastName: address.lastName, + invoiceMail: address.invoice_mail + } +}; + +export const toWiaasAddress = (address) => { + return { + id: address.id, + country_name: address.countryName, + delivery_mail: address.deliveryMail, + id_country_selected: address.idCountrySelected, + city: address.city, + detailed_address: address.detailedAddress, + zip_code: address.zipCode, + first_name: address.firstName, + last_name: address.lastName, + invoice_mail: address.invoiceMail + } +}; \ No newline at end of file diff --git a/frontend/src/helpers/ProfileHelper.js b/frontend/src/helpers/ProfileHelper.js index b03bf2b..17d3d93 100644 --- a/frontend/src/helpers/ProfileHelper.js +++ b/frontend/src/helpers/ProfileHelper.js @@ -1,3 +1,5 @@ +import { fromWiaasAddress } from "./AddressHelper"; + export const fromWiaasProfileInfo = (profileInfo) => { return { id: profileInfo.id, @@ -8,8 +10,8 @@ export const fromWiaasProfileInfo = (profileInfo) => { mail: profileInfo.mail, name: profileInfo.name, phone: profileInfo.phone, - billingAddresses: profileInfo.billing_addresses, - profileAddresses: profileInfo.profile_addresses, + billingAddresses: profileInfo.billing_addresses.map(address => fromWiaasAddress(address)), + profileAddresses: profileInfo.profile_addresses.map(address => fromWiaasAddress(address)), userType: profileInfo.user_type, } }; \ No newline at end of file