diff --git a/ng-seed/Appointment_Frontend_Build_latest.zip b/ng-seed/Appointment_Frontend_Build_latest.zip new file mode 100644 index 0000000..ee06d0f Binary files /dev/null and b/ng-seed/Appointment_Frontend_Build_latest.zip differ diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html index be48474..e64e790 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html +++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html @@ -8,7 +8,7 @@

Practitioner List

- + Search practitioner search diff --git a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss index 2fb464e..7640858 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss +++ b/ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss @@ -339,7 +339,7 @@ margin: 30px 25px 30px 30px; margin-left: 10px; } .scrollHVtab2 { - height: calc(100vh - 205px); + height: calc(100vh - 230px); } .add-button{ border: 1px solid #50497F; diff --git a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts index d91461e..8d5f0b0 100644 --- a/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts +++ b/ng-seed/src/app/appoinment/consultant-setting/edit-working-hours/edit-working-hours.component.ts @@ -120,7 +120,7 @@ export class EditWorkingHoursComponent implements OnInit { "Friday", "Saturday", ]; - seedData = [{ day: "Sunday", startTime: "09:00 am", endTime: "06:00 pm" }]; + seedData = [{ day: "Sunday", startTime: "09:00 am", endTime: "09:00 pm" }]; Select1: any = false; Select2: any = false; diff --git a/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.html b/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.html index 8d88fd0..1f9b277 100644 --- a/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.html +++ b/ng-seed/src/app/appoinment/customers/add-customers/add-customers.component.html @@ -1,5 +1,5 @@ -
{{action}} Customers +
{{action}} Customer
diff --git a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html index 4df56b3..9ede00a 100644 --- a/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html +++ b/ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.html @@ -1,5 +1,5 @@ -

Customers Details

+

Customer Details

Filter diff --git a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html index 0f4c897..735c6ef 100644 --- a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html +++ b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.html @@ -63,13 +63,21 @@
- # Booking ID + Booking ID
: {{bookingSummary.bookingId}}
-
Status:Confirmed
+
Status:Booked
+
+
+
+
+ Booked On +
+
+ : {{bookingSummary.createdAt | date:'dd/MM/yyyy'}}
@@ -85,7 +93,7 @@ Practitioner
- : {{serviceMapDetails.user[0].userName}} + : {{serviceMapDetails.user[0].userName}} - ({{serviceMapDetails.user[0].contactNo}})
@@ -97,33 +105,31 @@
+
+ Fees +
+
+ : {{busCurrency}} {{serviceMapDetails.duration.length>0 ? serviceMapDetails.duration[0].fees : serviceMapDetails.service[0].fees}} +
+
+ - + : {{customerBookingDetails.cusName}} - + -->
- Contact Details + Appointment For
- : {{customerBookingDetails.phoneNo}} + : {{customerBookingDetails.cusName}} - ({{customerBookingDetails.phoneNo}})
-
-
- Booked On -
-
- : {{bookingSummary.createdAt | date:'dd/MM/yyyy'}} -
-
diff --git a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts index 851e34f..53ad90d 100644 --- a/ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts +++ b/ng-seed/src/app/end-user/booking-summary/booking-summary.component.ts @@ -20,6 +20,7 @@ export class BookingSummaryComponent implements OnInit { logo: any; private apiUrl = environment.apiEndpoint; customerBookingDetails: any = []; + busCurrency: any = []; constructor(public end_user:EndUserService,private router:Router,) { this.logo = localStorage.getItem('logo') this.busName = localStorage.getItem('busName') @@ -59,6 +60,7 @@ export class BookingSummaryComponent implements OnInit { if (res.status == 200) { console.log(res) this.serviceMapDetails = res['data'][0] + this.busCurrency = this.serviceMapDetails['business'][0].currency } }) diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.html b/ng-seed/src/app/end-user/customer-info/customer-info.component.html index bca2478..0144538 100644 --- a/ng-seed/src/app/end-user/customer-info/customer-info.component.html +++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.html @@ -41,44 +41,26 @@ -
-
+
+
-
- +
+ Contact No is required Invalid Contact No Contact No must be at least 10 characters Limit exceed -
-
-
- -
- verified -
-
- -
- -
+
+
+ +
+ verified +
+
+
diff --git a/ng-seed/src/app/end-user/customer-info/customer-info.component.scss b/ng-seed/src/app/end-user/customer-info/customer-info.component.scss index acdbf22..7230e7c 100644 --- a/ng-seed/src/app/end-user/customer-info/customer-info.component.scss +++ b/ng-seed/src/app/end-user/customer-info/customer-info.component.scss @@ -144,4 +144,7 @@ mat-toolbar{ } .scrollHV { height: calc(100vh - 110px); -} \ No newline at end of file +} +.flexAlign{ + display: contents !important; +} diff --git a/ng-seed/src/app/end-user/service-list-details/service-list.component.html b/ng-seed/src/app/end-user/service-list-details/service-list.component.html index 3d16cad..44138ec 100644 --- a/ng-seed/src/app/end-user/service-list-details/service-list.component.html +++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.html @@ -45,7 +45,8 @@ - {{serviceListDetails.description}} + {{serviceListDetails.description}}
diff --git a/ng-seed/src/app/end-user/service-list-details/service-list.component.scss b/ng-seed/src/app/end-user/service-list-details/service-list.component.scss index d781280..9d9328a 100644 --- a/ng-seed/src/app/end-user/service-list-details/service-list.component.scss +++ b/ng-seed/src/app/end-user/service-list-details/service-list.component.scss @@ -184,4 +184,13 @@ footer { .mat-card-title{ margin-bottom: 0px !important; +} + +.descriWrap{ + width: 251px; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } \ No newline at end of file diff --git a/ng-seed/src/app/session/forgot-password/forgot-password-component.html b/ng-seed/src/app/session/forgot-password/forgot-password-component.html index 1ad6d52..e3b467b 100644 --- a/ng-seed/src/app/session/forgot-password/forgot-password-component.html +++ b/ng-seed/src/app/session/forgot-password/forgot-password-component.html @@ -6,21 +6,27 @@

Forgot Password?

-

You can reset your password here.

- -
- - - - Please enter a valid email address - - - Email is required - - - -
- +
+

You can reset your password here.

+
+
+ + + + Please enter a valid email address + + + Email is required + + + +
+
+
+
+

{{forgotTokenEmail.message}}

+ +
diff --git a/ng-seed/src/app/session/forgot-password/forgot-password.component.ts b/ng-seed/src/app/session/forgot-password/forgot-password.component.ts index e73896b..e97cb41 100644 --- a/ng-seed/src/app/session/forgot-password/forgot-password.component.ts +++ b/ng-seed/src/app/session/forgot-password/forgot-password.component.ts @@ -3,6 +3,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import {Router} from "@angular/router"; import { NotifierService } from 'angular-notifier'; import { SessionService } from 'app/session-services/session.service'; +import { environment } from 'environments/environment'; @Component({ selector: 'ms-forgot-password', @@ -17,7 +18,8 @@ export class ForgotPasswordComponent { form: FormGroup; forgotTokenEmail: any; forgotMailDara: any; - + public mailUrl = environment.mailUrl; + resetLink: any = 0; constructor(private router: Router,public _ser:SessionService,private notifierService: NotifierService) { this._ser.forgotEmail_observable$.subscribe((res) => { console.log('email', res); @@ -35,14 +37,19 @@ export class ForgotPasswordComponent { submit(){ console.log(this.form.value) const mailid = this.form['value'].email.split(/\s/).join(''); - let forgotMail = {'email':mailid,'urlDomain':window.location.origin} + let forgotMail = {'email':mailid,'urlDomain':this.mailUrl} console.log(forgotMail) this._ser.getForgotToken(forgotMail).subscribe(res => { - console.log(res) - this.forgotTokenEmail = res - this._ser.getForgotDetails(this.forgotTokenEmail) - this.notifierService.notify('warning', res.message); - //this.router.navigate(['authentication/reset-password']) + if(res.status == 200){ + this.resetLink = 1 + console.log(res) + this.forgotTokenEmail = res + this._ser.getForgotDetails(this.forgotTokenEmail) + this.notifierService.notify('success', res.message); + //this.router.navigate(['authentication/reset-password']) + } else{ + this.notifierService.notify('warning', 'Invalid Mail'); + } }, err => { //alert(err.message); diff --git a/ng-seed/src/environments/environment.prod.ts b/ng-seed/src/environments/environment.prod.ts index 4e020a7..4e80138 100644 --- a/ng-seed/src/environments/environment.prod.ts +++ b/ng-seed/src/environments/environment.prod.ts @@ -7,6 +7,7 @@ export const environment = { //EndUser URL endUserUrl: window.location.origin+'/appointment/#/customer/', + mailUrl:window.location.origin+'/appointment', firebase: { apiKey: "AIzaSyCKbfDJ5Qf0rDP3WKppa94u9xuVaVabaDw", diff --git a/ng-seed/src/environments/environment.ts b/ng-seed/src/environments/environment.ts index 1a53074..ec0a700 100644 --- a/ng-seed/src/environments/environment.ts +++ b/ng-seed/src/environments/environment.ts @@ -7,15 +7,16 @@ export const environment = { production: false, environmentName: 'Testing Environment',//Localhost Environment. // apiEndpoint:'http://venbainfotech.com:5000/api/', - apiEndpoint:'http://192.168.1.19:8080/api/', + // apiEndpoint:'http://192.168.1.19:8080/api/', // apiEndpoint:'https://api.venbait.in/api/', // apiEndpoint:'http://venbainfotech.com:5000/api/', // apiEndpoint:'http://192.168.1.17:8080/api/', -// apiEndpoint:'https://api.venbait.in/api/', + apiEndpoint:'https://api.venbait.in/api/', //EndUser URL endUserUrl: window.location.origin+'/#/customer/', + mailUrl:window.location.origin, firebase: { apiKey: "AIzaSyCKbfDJ5Qf0rDP3WKppa94u9xuVaVabaDw",