Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hot Fixes #245

Merged
merged 2 commits into from
Sep 8, 2018
Merged

Hot Fixes #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
390f5a4
Hot Fixex
jaypal412 Aug 28, 2018
0fcc42a
added missing fields
pkrawat1 Sep 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 73 additions & 80 deletions src/app/checkout/address/add-address/add-address.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,85 +1,78 @@
<form class="form" [formGroup]="emailForm" *ngIf="!isAuthenticated">
<div class="form-group">
<label for="exampleInputEmail1">Email
<span class="required">*</span>
</label>
<input type="email" class="form-control" formControlName="email">
<p *ngIf="emailForm.get('email').hasError('required') && emailForm.get('email').touched" class="value-err show">This
is a mandatory field</p>
</div>
</form>
<form class="form" [formGroup]="addressForm" (ngSubmit)="onSubmit()">
<div class="row">
<div class="form-group col-sm-6">
<label>Pin Code
<span class="required">*</span>
</label>
<input type="tel" class="form-control" formControlName="zipcode">
<p *ngIf="addressForm.get('zipcode').hasError('required') && addressForm.get('zipcode').touched" class="value-err text-danger show">This
is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label> Locality / Town
<span class="required">*</span>
</label>
<input type="text" class="form-control" formControlName="address2">
<p *ngIf="addressForm.get('address2').hasError('required') && addressForm.get('address2').touched" class="value-err text-danger show">This
is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label>City / District
<span class="required">*</span>
</label>
<input type="text" class="form-control" formControlName="city">
<p *ngIf="addressForm.get('city').hasError('required') && addressForm.get('city').touched" class="value-err text-danger show">This
is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label> State </label>
<select class="form-control" formControlName="state_name">
<option *ngIf="addressEdit">{{addressEdit.state.name}}</option>
<option *ngFor="let state of states">{{state.name}}</option>
</select>
</div>

<div class="form-group col-sm-6">
<label>First Name
<div class="useraddress">
<form class="form " [formGroup]="emailForm" *ngIf="!isAuthenticated">
<div class="form-group">
<label for="exampleInputEmail1">Email
<span class="required">*</span>
</label>
<input type="text" class="form-control" formControlName="firstname">
<p *ngIf="addressForm.get('firstname').hasError('required') && addressForm.get('firstname').touched" class="value-err text-danger show">This
is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label> Last Name
<span class="required">*</span>
</label>
<input type="text" class="form-control" formControlName="lastname">
<p *ngIf="addressForm.get('lastname').hasError('required') && addressForm.get('lastname').touched" class="value- text-danger show">This
is a mandatory field</p>
</div>

<div class="form-group col-sm-6">
<label>Address
<span class="required">*</span>
</label>
<textarea type="text" class="form-control" formControlName="address1"></textarea>
<p *ngIf="addressForm.get('address1').hasError('required') && addressForm.get('address1').touched" class="value-err text-danger show">This
is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label>Mobile No
<span class="required">*</span>
</label>
<input type="tel" class="form-control" formControlName="phone">
<p *ngIf="addressForm.get('phone').hasError('required') && addressForm.get('phone').touched" class="value-err text-danger show">This
is a mandatory field</p>
</div>
<div *ngIf="isAuthenticated" class="save-button col-12 col-sm-6">
<button class="btn themebtnprimary">SAVE</button>
<input type="email" class="form-control" formControlName="email">
<p *ngIf="emailForm.get('email').hasError('required') && emailForm.get('email').touched" class="value-err show">This is a mandatory field</p>
</div>
<div *ngIf="!isAuthenticated" class="save-button col-12 col-sm-6">
<button [disabled]="!addressForm.valid && !emailForm.valid">SAVE</button>
</form>
<form class="form "[formGroup]="addressForm" (ngSubmit)="onSubmit()">
<div class="row">
<div class="form-group col-sm-6">
<label>Pin Code
<span class="required">*</span>
</label>
<input type="tel" class="form-control" formControlName="zipcode">
<p *ngIf="addressForm.get('zipcode').hasError('required') && addressForm.get('zipcode').touched" class="value-err text-danger show">This is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label> Locality / Town
<span class="required">*</span>
</label>
<input type="text" class="form-control" formControlName="address2">
<p *ngIf="addressForm.get('address2').hasError('required') && addressForm.get('address2').touched" class="value-err text-danger show">This is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label>City / District
<span class="required">*</span>
</label>
<input type="text" class="form-control" formControlName="city">
<p *ngIf="addressForm.get('city').hasError('required') && addressForm.get('city').touched" class="value-err text-danger show">This is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label> State </label>
<select class="form-control" formControlName="state_name">
<option *ngIf="addressEdit">{{addressEdit.state.name}}
<option *ngFor="let state of states">{{state.name}}</option>
</select>
</div>
<div class="form-group col-sm-6">
<label>First Name
<span class="required">*</span>
</label>
<input type="text" class="form-control" formControlName="firstname">
<p *ngIf="addressForm.get('firstname').hasError('required') && addressForm.get('firstname').touched" class="value-err text-danger show">This is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label> Last Name
<span class="required">*</span>
</label>
<input type="text" class="form-control" formControlName="lastname">
<p *ngIf="addressForm.get('lastname').hasError('required') && addressForm.get('lastname').touched" class="value- text-danger show">This is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label>Address
<span class="required">*</span>
</label>
<textarea type="text" class="form-control" formControlName="address1"></textarea>
<p *ngIf="addressForm.get('address1').hasError('required') && addressForm.get('address1').touched" class="value-err text-danger show">This is a mandatory field</p>
</div>
<div class="form-group col-sm-6">
<label>Mobile No
<span class="required">*</span>
</label>
<input type="tel" class="form-control" formControlName="phone">
<p *ngIf="addressForm.get('phone').hasError('required') && addressForm.get('phone').touched" class="value-err text-danger show">This is a mandatory field</p>
</div>
<div *ngIf="isAuthenticated" class="save-button col-12 col-sm-6">
<button class="btn themebtnprimary">SAVE</button>
</div>
<div *ngIf="!isAuthenticated" class="save-button col-12 col-sm-6">
<button class="btn themebtnprimary" [disabled]="!addressForm.valid && !emailForm.valid">SAVE</button>
</div>
</div>
</div>
</form>
</form>
</div>
5 changes: 5 additions & 0 deletions src/app/checkout/address/add-address/add-address.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,8 @@
padding: 10px;
}
}
.useraddress {
border: 1px solid $gray-10;
padding: .8em;
margin-bottom: 15px
}
6 changes: 3 additions & 3 deletions src/app/checkout/address/address.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
</div>
</div>
<div *ngIf="!(shipAddress$ | async)" class="row">
<div *ngIf="!(shipAddress$ | async)" class="row m-0 ">
<div class="left col-12 col-md-10 col-lg-10 m-auto border-right-0">
<div class="add-address">
<span class="add-label">
Expand All @@ -26,14 +26,14 @@
<app-add-address [addressEdit]="null"></app-add-address>
</div>
</div>
<div *ngIf="editAddress" class="row">
<div *ngIf="editAddress" class="row m-0 useraddress">
<div class="left col-12 col-md-10 col-lg-10 m-auto border-right-0">
<div class="add-address">
<span class="add-label">
EDIT ADDRESS
</span>
</div>
<app-add-address (addressEdited)=addressEditedDone($event) [addressEdit]="addressData" [orderNumber]="orderNumber$ | async">
<app-add-address (addressEdited)=addressEditedDone($event) [addressEdit]="addressData" [orderNumber]="orderNumber$ | async">
</app-add-address>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/app/checkout/address/address.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import '../../shared/scss/selected_theme_variables';
.address-section {

margin: 0 auto;
.left {
padding-bottom: 20px;
Expand Down
2 changes: 2 additions & 0 deletions src/app/core/models/order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ export class Order {
line_items: [LineItem];
payments: [Payment];
display_total: string;
display_item_total: string;
display_ship_total: string;
}

// NOTE: This just mimics the serializer exposed in the API
Expand Down
2 changes: 1 addition & 1 deletion src/app/layout/header/components/header-search/header-search.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
margin-right: 26px !important
}
input.desktop-search-bar {
width: 82%;
width: 72%;
font-family: $primary-font;
display: inline-block;
font-size: 16px;
Expand Down