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

Frontend profile settings #20

Merged
bilal.catic merged 35 commits from frontend-profileSettings into master 2018-09-20 14:27:03 +02:00
Conversation 30 Commits 35 Files Changed 24 +20 -2
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c322c8ac78 - Show all commits

9
frontend/src/containers/cart/components/SelectDeliveryAddress.jsx
View File

@@ -21,8 +21,17 @@ class SelectDeliveryAddress extends Component {
<div> <div>
<div className="address-text"> <div className="address-text">
<Input id={'delivery-addres-check-' + profileAddress.id} checked={idSelectedDeliveryAddress === profileAddress.id} type="radio" onChange={this.handleOptionChange} name="deliveryAddress" /> <Input id={'delivery-addres-check-' + profileAddress.id} checked={idSelectedDeliveryAddress === profileAddress.id} type="radio" onChange={this.handleOptionChange} name="deliveryAddress" />
<div className="small-address-title">
{profileAddress.firstName} {profileAddress.lastName}
{
profileAddress.deliveryMail &&
<span>( {profileAddress.deliveryMail} )</span>
}
</div>
<div>
{profileAddress.countryName}, {profileAddress.city}, {profileAddress.detailedAddress}, {profileAddress.zipCode} {profileAddress.countryName}, {profileAddress.city}, {profileAddress.detailedAddress}, {profileAddress.zipCode}
</div> </div>
</div>
<div className="address-icons"> <div className="address-icons">
<i className="fa fa-pencil control-icon edit-address-btn" <i className="fa fa-pencil control-icon edit-address-btn"
onClick={()=> {openAddressDialog('edit', profileAddress)}} onClick={()=> {openAddressDialog('edit', profileAddress)}}

9
frontend/src/containers/profileSettings/components/ProfileAddress.jsx
View File

@@ -8,8 +8,17 @@ class ProfileAddress extends Component {
return ( return (
<div className="address-row"> <div className="address-row">
<div className="address-text"> <div className="address-text">
<div className="small-address-title">
{profileAddress.firstName} {profileAddress.lastName}
{
profileAddress.deliveryMail &&
<span>( {profileAddress.deliveryMail} )</span>
}
</div>
<div>
{profileAddress.countryName}, {profileAddress.city}, {profileAddress.detailedAddress}, {profileAddress.zipCode} {profileAddress.countryName}, {profileAddress.city}, {profileAddress.detailedAddress}, {profileAddress.zipCode}
</div> </div>
</div>
<div className="address-icons"> <div className="address-icons">
<i className="fa fa-pencil control-icon edit-address-btn" <i className="fa fa-pencil control-icon edit-address-btn"
onClick={()=> {openAddressDialog('edit', profileAddress)}} onClick={()=> {openAddressDialog('edit', profileAddress)}}