Skip to content

Commit 22ba4df

Browse files
Azo-hubAzo-hub
committed
update 4.1
1 parent c7f20a0 commit 22ba4df

File tree

5 files changed

+39
-173
lines changed

5 files changed

+39
-173
lines changed

‎src/app/add-property-details-owner/add-property-details-owner.component.ts

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -99,33 +99,26 @@ export class AddPropertyDetailsOwnerComponent implements OnInit, OnDestroy, Afte
9999

100100

101101
states = [
102-
{ value: "Alabama", label: "Alabama" }, { value: "Alaska", label: "Alaska" },
103-
{ value: "Arizona", label: "Arizona" }, { value: "Arkansas", label: "Arkansas" },
104-
{ value: "California", label: "California" }, { value: "Colorado", label: "Colorado" },
105-
{ value: "Connecticut", label: "Connecticut" }, { value: "Delaware", label: "Delaware" },
106-
{ value: "Florida", label: "Florida" }, { value: "Georgia", label: "Georgia" },
107-
{ value: "Hawaii", label: "Hawaii" }, { value: "Idaho", label: "Idaho" },
108-
{ value: "Illinois", label: "Illinois" }, { value: "Indiana", label: "Indiana" },
109-
{ value: "Iowa", label: "Iowa" }, { value: "Kansas", label: "Kansas" },
110-
{ value: "Kentucky[D]", label: "Kentucky[D]" }, { value: "Louisiana", label: "Louisiana" },
111-
{ value: "Maine", label: "Maine" }, { value: "Maryland", label: "Maryland" },
112-
{ value: "Massachusetts[D]", label: "Massachusetts[D]" }, { value: "Michigan", label: "Michigan" },
113-
{ value: "Minnesota", label: "Minnesota" }, { value: "Mississippi", label: "Mississippi" },
114-
{ value: "Missouri", label: "Missouri" }, { value: "Montana", label: "Montana" },
115-
{ value: "Nebraska", label: "Nebraska" }, { value: "Nevada", label: "Nevada" },
116-
{ value: "New Hampshire", label: "New Hampshire" }, { value: "New Jersey", label: "New Jersey" },
117-
{ value: "New Mexico", label: "New Mexico" }, { value: "New York", label: "New York" },
118-
{ value: "North Carolina", label: "North Carolina" }, { value: "North Dakota", label: "North Dakota" },
119-
{ value: "Ohio", label: "Ohio" }, { value: "Oklahoma", label: "Oklahoma" },
120-
{ value: "Oregon", label: "Oregon" }, { value: "Pennsylvania[D]", label: "Pennsylvania[D]" },
121-
{ value: "Rhode Island", label: "Rhode Island" }, { value: "South Carolina", label: "South Carolina" },
122-
{ value: "South Dakota", label: "South Dakota" }, { value: "Tennessee", label: "Tennessee" },
123-
124-
{ value: "Texas", label: "Texas" }, { value: "Utah", label: "Utah" },
125-
{ value: "Vermont", label: "Vermont" }, { value: "Virginia[D]", label: "Virginia[D]" },
126-
{ value: "Washington", label: "Washington" }, { value: "West Virginia", label: "West Virginia" },
127-
{ value: "Wisconsin", label: "Wisconsin" }, { value: "Wyoming", label: "Wyoming" },
128-
{ value: "District of Columbia", label: "District of Columbia" }
102+
{ value: "Abia", label: "Abia" }, { value: "Adamawa", label: "Adamawa" },
103+
{ value: "Akwa Ibom", label: "Akwa Ibom" }, { value: "Anambra", label: "Anambra" },
104+
{ value: "Bauchi", label: "Bauchi" }, { value: "Bayelsa", label: "Bayelsa" },
105+
{ value: "Benue", label: "Benue" }, { value: "Borno", label: "Borno" },
106+
{ value: "Cross River", label: "Cross River" }, { value: "Delta", label: "Delta" },
107+
{ value: "Ebonyi", label: "Ebonyi" }, { value: "Edo", label: "Edo" },
108+
{ value: "Ekiti", label: "Ekiti" }, { value: "Enugu", label: "Enugu" },
109+
{ value: "Gombe", label: "Gombe" }, { value: "Imo", label: "Imo" },
110+
{ value: "Jigawa", label: "Jigawa" }, { value: "Kaduna", label: "Kaduna" },
111+
{ value: "Kano", label: "Kano" }, { value: "Katsina", label: "Katsina" },
112+
{ value: "Kebbi", label: "Kebbi" }, { value: "Kogi", label: "Kogi" },
113+
{ value: "Kwara", label: "Kwara" }, { value: "Lagos", label: "Lagos" },
114+
{ value: "Nasarawa", label: "Nasarawa" }, { value: "Niger", label: "Niger" },
115+
{ value: "Ogun", label: "Ogun" }, { value: "Ondo", label: "Ondo" },
116+
{ value: "Osun", label: "Osun" }, { value: "Oyo", label: "Oyo" },
117+
{ value: "Plateau", label: "Plateau" }, { value: "Rivers", label: "Rivers" },
118+
{ value: "Sokoto", label: "Sokoto" }, { value: "Taraba", label: "Taraba" },
119+
{ value: "Yobe", label: "Yobe" }, { value: "Zamfara", label: "Zamfara" },
120+
{ value: "F.C.T.", label: "F.C.T." }
121+
129122
]
130123

131124

‎src/app/edit-property/edit-property.component.ts

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -120,50 +120,6 @@ export class EditPropertyComponent implements OnInit, OnDestroy {
120120
public onEditProperty(property: Property): void {
121121
this.showLoading = true;
122122

123-
/* const formData = new FormData();
124-
formData.append("id", this.editPropertyIdFromUrl);
125-
formData.append("name", editpropertyForm.value.propertyNameInput.value);
126-
formData.append("propertyType", editpropertyForm.value.propertyTypeInput);
127-
formData.append("propertyPrice", editpropertyForm.value.propertyPriceInput.toString());
128-
formData.append("propertyCountry", editpropertyForm.value.propertyCountryInput);
129-
formData.append("propertyState", property.propertyState);
130-
formData.append("propertyCity", property.propertyCity);
131-
formData.append("propertyAddress1", property.propertyAddress1);
132-
formData.append("propertyAddress2", property.propertyAddress2);
133-
formData.append("propertyZipCode", property.propertyZipCode);
134-
formData.append("propertyCleaningFee", property.propertyCleaningFee.toString());
135-
formData.append("noOfAccommodation", property.theSpace_noOfAccommodation);
136-
137-
formData.append("noOfBedrooms", property.theSpace_noOfBedrooms);
138-
formData.append("noOfKing", property.beds_noOfKing);
139-
formData.append("noOfQueen", property.beds_noOfQueen);
140-
formData.append("noOfSingle", property.beds_noOfSingle);
141-
formData.append("noOfMasterBathroom", property.bathrooms_noOfMasterBathroom);
142-
formData.append("noOfPrivateBathroom", property.bathrooms_noOfPrivateBathroom);
143-
formData.append("noOfHalfBath", property.bathrooms_noOfHalfBath);
144-
formData.append("Kitchen", property.sharedSpaces_kitchen);
145-
formData.append("laudryRoom", property.sharedSpaces_laundryRoom);
146-
formData.append("outDoorParking", property.sharedSpaces_outDoorParking);
147-
formData.append("garage", property.sharedSpaces_garage);
148-
formData.append("balcony", property.sharedSpaces_balcony);
149-
formData.append("backyard", property.sharedSpaces_backyard);
150-
formData.append("wifi", property.amenities_wifi);
151-
formData.append("TowelsBedsheetsSoapAndToiletpaper", property.amenities_towelsBedsheetsSoapAndToiletpaper);
152-
formData.append("shampoo", property.amenities_shampoo);
153-
formData.append("closetDrawers", property.amenities_closetDrawers);
154-
formData.append("hairDryer", property.amenities_hairDryer);
155-
formData.append("LEDTV", property.amenities_LEDTV);
156-
formData.append("grill", property.amenities_grill);
157-
formData.append("parking", property.amenities_parking);
158-
formData.append("outdoorSwimmingPool", property.amenities_outdoorSwimmingPool);
159-
formData.append("iron&Board", property.amenities_ironBoard);
160-
formData.append("satelliteOrCable", property.amenities_satelliteOrCable);
161-
formData.append("microwave", property.amenities_microwave);
162-
formData.append("boardGames", property.amenities_boardGames);
163-
formData.append("toaster", property.amenities_toaster);
164-
formData.append("coffeeMaker", property.amenities_coffeeMaker);
165-
formData.append("stove", property.amenities_stove); */
166-
167123
this.subscriptions.push(
168124

169125
this.propertyService.editProperty(property).subscribe(

‎src/app/model/booking.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { PaymentMethod } from "./payment-method";
12
import { Property } from "./property";
23
import { User } from "./user";
34

@@ -12,7 +13,7 @@ export class Booking {
1213
public bookingLastName: string;
1314
public bookingEmailAddress: string;
1415
public bookingPhoneNumber: string;
15-
public bookingPhoneHomeNumber: string;
16+
public bookingPhonehomeNumber: string;
1617
public bookingCountry: string;
1718
public bookingStreet: string;
1819
public bookingCity: string;
@@ -22,6 +23,7 @@ export class Booking {
2223
public noOfGuest: string;
2324
public noOfChildren: string;
2425
public pets: string;
26+
public paymentMethod: PaymentMethod;
2527

2628

2729
constructor() {
@@ -33,7 +35,7 @@ export class Booking {
3335
this.bookingLastName = "";
3436
this.bookingEmailAddress = "";
3537
this.bookingPhoneNumber = "";
36-
this.bookingPhoneHomeNumber = "";
38+
this.bookingPhonehomeNumber = "";
3739
this.bookingCountry = "";
3840
this.bookingStreet = "";
3941
this.bookingCity = "";
@@ -42,6 +44,7 @@ export class Booking {
4244
this.noOfGuest = "";
4345
this.noOfChildren = "";
4446
this.pets = "";
47+
this.paymentMethod = new PaymentMethod;
4548

4649

4750
}

‎src/app/order-details/order-details.component.html

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,19 @@ <h4 class="mb-5">Booking Address</h4>
3131
<p class="form-control">{{booking.bookingPhoneNumber}}</p>
3232
</div>
3333

34-
<!-- <div class="form-group">
34+
<div class="form-group">
3535
<label class="my-2">Home Phone Nmber</label>
36-
<p class="form-control">{{}}</p>
37-
</div> -->
36+
<p class="form-control">{{booking.bookingPhonehomeNumber}}</p>
37+
</div>
38+
39+
<div class="form-group">
40+
<label class="my-2">Payment Card Details</label>
41+
<p class="form-control"><span>Card Holder: </span>{{booking.paymentMethod.cardHolderName}}<br />
42+
<span>Card Type: </span>{{booking.paymentMethod.cardType}}
43+
</p>
44+
45+
</div>
46+
3847

3948
</div>
4049

‎src/app/user-profile/user-profile.component.html

Lines changed: 2 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ <h4 class="pt-sm-2 pb-1 mb-0 text-nowrap">{{loggedInUser?.firstname}}
7777
data-bs-toggle="tab" style="color:inherit;">Property Listed</a></li>
7878
<li class="nav-item" [hidden]="!isAdmin"><a class="nav-link" href="#users"
7979
data-bs-toggle="tab" style="color:inherit;">All Users</a></li>
80-
<li class="nav-item" [hidden]="!isAdmin"><a class="nav-link" href="#dates"
81-
data-bs-toggle="tab" style="color:inherit;">Dates</a></li>
80+
8281
<li class="nav-item" [hidden]="!isAdmin"><a class="nav-link" href="#Allbooking"
8382
data-bs-toggle="tab" style="color:inherit;">List of Property Booked</a></li>
8483
</ul>
@@ -405,100 +404,6 @@ <h6 class="card-subtitle">{{user.email}}</h6>
405404

406405
</div>
407406

408-
<div class="tab-pane fade in show" id="dates" [hidden]="!isAdminOrOwner">
409-
<div class="container">
410-
<div class="row">
411-
<div class="col-md-12">
412-
<input name="searchTermDate" #searchInputDate="ngModel" ngModel
413-
(ngModelChange)="onSearchPropertyDate(searchInputDate.value)"
414-
type="search" placeholder="Search Property"
415-
class="form-control" />
416-
</div>
417-
</div>
418-
</div>
419-
<div class="container-fluid">
420-
<div class="row" *ngFor="let propertyEach of Allproperties">
421-
<div class="col-md-12">
422-
<div class="card my-3 mx-2">
423-
<div class="row gy-2">
424-
<div class="col-md-7">
425-
426-
<img src="https://res.cloudinary.com/azostore/image/upload/c_fill/bookingwebapp_1{{propertyEach.name}}{{propertyEach.id}}.jpg"
427-
class="img-fluid rounded-start"
428-
alt="Property Image">
429-
430-
</div>
431-
432-
433-
<div class="col-md-5">
434-
435-
<div class="card-body">
436-
<a routerLink="/propertydetails/{{propertyEach.id}}"
437-
style="color:inherit; text-decoration:none;">
438-
<h5 class="card-subtitle">
439-
{{propertyEach.propertyType}}</h5>
440-
441-
<h3 class="card-title">
442-
<b>{{propertyEach.name}}</b>
443-
</h3>
444-
445-
<p class="card-text">
446-
<small
447-
class="text-muted">$&nbsp;{{propertyEach.propertyPrice}}</small>
448-
</p>
449-
450-
</a>
451-
<div class="row mt-2 gy-2">
452-
<div class="col-sm-3"></div>
453-
<div class="col-sm-6"><button
454-
class="form-control btn btn-block btn-secondary"
455-
(click)="displayDate()">Add
456-
Dates</button></div>
457-
<div class="col-sm-3"></div>
458-
</div>
459-
<div class="row my-3 gy-2 " [hidden]="showDates">
460-
<div class="col-sm-6 form-group">
461-
<label>Check-in Date</label>
462-
<input class="form-control my-2" type="date"
463-
placeholder="check-in Date"
464-
name="checkinDateAdmin"
465-
#checkinDateAdmin="ngModel" ngModel />
466-
</div>
467-
<div class="col-sm-6 form-group">
468-
<label>Check-out Date</label>
469-
<input class="form-control my-2" type="date"
470-
placeholder="check-out Date"
471-
name="checkoutDateAdmin"
472-
#checkoutDateAdmin="ngModel" ngModel />
473-
</div>
474-
</div>
475-
<div class="row" [hidden]="addDatesBtn">
476-
<div class="col-sm-6"></div>
477-
<div class="col-sm-6">
478-
<button
479-
class="form-control btn btn-block btn-secondary"
480-
(click)="onAddDate(checkinDateAdmin.value,checkoutDateAdmin.value,propertyEach.id)">
481-
<i class="fa fa-spinner fa-spin "
482-
*ngIf="addDateShowLoading"></i>&nbsp;&nbsp;
483-
<span
484-
*ngIf="addDateShowLoading===true">Loading...</span>
485-
<span
486-
*ngIf="addDateShowLoading === false">Add</span>
487-
</button>
488-
</div>
489-
</div>
490-
491-
</div>
492-
493-
494-
495-
</div>
496-
</div>
497-
</div>
498-
</div>
499-
</div>
500-
</div>
501-
</div>
502407

503408

504409
<div class="tab-pane fade in show" id="bookingHistory">
@@ -693,7 +598,7 @@ <h3 class="card-title">
693598
<button routerLink="/addNewPaymentMethod" class="btn btn-block btn-secondary">
694599
<span>Add Payment Method</span>
695600
</button>
696-
601+
697602
</div>
698603
</div>
699604
</div>

0 commit comments

Comments
 (0)