Skip to content

F
ForexWeb
Commit 75033ba7 by Ajil
Options

21-03-2019

parent fc72bf35
Showing with 121 additions and 59 deletions
sample.html 0 → 100644
<html>
<head>
<style>
.input_container{
width:100%;
}
</style>
</head>
<body>
<div class="input_container">
<input class="" placeholder="sample">
<div class="message">
Sample message
</div>
</div>
</body>
</html>
\ No newline at end of file
src/app/app.component.ts
......@@ -38,6 +38,8 @@ export class AppComponent {
$('body').removeClass('ar');
}
this.lang = 'en';
translate.setDefaultLang(this.lang);
// the lang to use, if the lang isn't available, it will use the current loader to get them
......
src/app/checker/addforex/addforex.component.html
......@@ -85,6 +85,9 @@
<div class="s_error" *ngIf="!providerForm.controls['cr_id'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['cr_id'].hasError('required')">{{error_msg.required}} </div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['cr_id'].valid && providerForm.controls['cr_id'].touched">
<div class="s_validation" *ngIf="providerForm.controls['cr_id'].hasError('pattern')">{{error_msg.crId}}</div>
</div>
</div>
<div class="col">
<div class="provider_data_content">
......@@ -121,8 +124,8 @@
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerForm.controls['phone'].touched && !providerForm.controls['phone'].hasError('pattern')">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('maxlength')">{{error_msg.maxLength}} 15</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('minlength')">{{error_msg.minLength}} 8</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('maxlength')">{{error_msg.maxLength}} 10</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('minlength')">{{error_msg.minLength}} 10</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('required')">{{error_msg.required}} </div>
......@@ -149,8 +152,8 @@
<p> {{'addforex.Status' | translate}}</p>
<select class="provider_input" formControlName="online_status">
<option disabled hidden>{{'addforex.Status' | translate}}</option>
<option value="1">{{'addforex.Online' | translate}}</option>
<option value="0">{{'addforex.Offline' | translate}}</option>
<option value="1">Online</option>
<option value="0">Offline</option>
</select>
</div>
<div class="s_error" *ngIf="!providerForm.controls['online_status'].valid && providerSubmit">
......
src/app/checker/addforex/addforex.component.ts
......@@ -11,10 +11,11 @@ import { FormControl, FormGroup, FormBuilder, Validators, ValidationErrors } fro
})
export class AddforexComponent implements OnInit {
providerForm: FormGroup;
mobnumPattern = '^((\\+?)|0)?[0-9]{8,15}$';
mobnumPattern = '^((\\+?)|0)?[0-9]{9,10}$';
emailPattern = '^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$';
contactPattern = '[a-zA-Z ]*';
providerSubmit: boolean;
crId = '^((\\+?)|0)?[0-9]{10}$';
lang = 'en';
error_msg: any[];
funcName: any;
......@@ -43,7 +44,7 @@ export class AddforexComponent implements OnInit {
this.providerForm = this.formBuilder.group({
'name': ['', Validators.compose([Validators.required])],
'cr_manager': ['', Validators.compose([Validators.required])],
'cr_id': ['', Validators.compose([Validators.required])],
'cr_id': ['', Validators.compose([Validators.required, Validators.pattern(this.crId)])],
'contact': ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z \-\']+')])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
......@@ -82,6 +83,7 @@ export class AddforexComponent implements OnInit {
this.success = true;
this.providerSubmit = false;
this.providerForm.reset();
this.providerForm.controls['type'].setValue(2);
} else {
this.error = true;
this.responseError = this.vs.errorCode[this.lang][response.errorCode];
......
src/app/checker/addprovider/addprovider.component.html
......@@ -27,11 +27,11 @@
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'addprovider.Success! ' | translate}}</strong> {{'addprovider.Provider created successfully.' | translate}}
<strong> {{'addprovider.Success!' | translate}}</strong> {{'addprovider.Provider created successfully' | translate}}
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'addprovider.Warning! ' | translate}}</strong> {{responseError}}
<strong> {{'addprovider.Warning!' | translate}}</strong> {{responseError}}
</div>
<form [formGroup]="providerForm" (ngSubmit)="regProcess()" autocomplete="off">
<div class="row">
......@@ -80,11 +80,14 @@
<div class="col">
<div class="provider_data_content">
<p> {{'addprovider.CR ID' | translate}}</p>
<input class="provider_input" placeholder="" type="text" formControlName="cr_id">
<input class="provider_input" placeholder="" type="number" formControlName="cr_id">
</div>
<div class="s_error" *ngIf="!providerForm.controls['cr_id'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['cr_id'].hasError('required')">{{error_msg.required}} </div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['cr_id'].valid && providerForm.controls['cr_id'].touched">
<div class="s_validation" *ngIf="providerForm.controls['cr_id'].hasError('pattern')">{{error_msg.crId}}</div>
</div>
</div>
<div class="col">
<div class="provider_data_content">
......@@ -118,9 +121,8 @@
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('pattern')">{{error_msg.phone}}</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerForm.controls['phone'].touched && !providerForm.controls['phone'].hasError('pattern')">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('maxlength')">{{error_msg.maxLength}} 15</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('minlength')">{{error_msg.minLength}} 8</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('maxlength')">{{error_msg.maxLength}} 10</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('minlength')">{{error_msg.minLength}} 10</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('required')">{{error_msg.required}} </div>
......
src/app/checker/addprovider/addprovider.component.ts
......@@ -11,7 +11,8 @@ import { FormControl, FormGroup, FormBuilder, Validators, ValidationErrors } fro
})
export class AddproviderComponent implements OnInit {
providerForm: FormGroup;
mobnumPattern = '^((\\+?)|0)?[0-9]{8,15}$';
mobnumPattern = '^((\\+?)|0)?[0-9]{9,10}$';
crId = '^((\\+?)|0)?[0-9]{10}$';
emailPattern = '^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$';
providerSubmit: boolean;
lang = 'en';
......@@ -40,7 +41,7 @@ export class AddproviderComponent implements OnInit {
this.providerForm = this.formBuilder.group({
'name': ['', Validators.compose([Validators.required])],
'cr_manager': ['', Validators.compose([Validators.required])],
'cr_id': ['', Validators.compose([Validators.required])],
'cr_id': ['', Validators.compose([Validators.required, Validators.pattern(this.crId)])],
'contact': ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z \-\']+')])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
......@@ -77,6 +78,7 @@ export class AddproviderComponent implements OnInit {
this.success = true;
this.providerSubmit = false;
this.providerForm.reset();
this.providerForm.controls['type'].setValue(3);
} else {
this.error = true;
this.responseError = this.vs.errorCode[this.lang][response.errorCode];
......
src/app/checker/currency-add/currency-add.component.html
......@@ -26,7 +26,7 @@
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'currencyadd.Success!' | translate}}</strong> {{'currencyadd.Currency added successfully.' | translate}}
<strong> {{'currencyadd.Success!' | translate}}</strong> Currency added successfully
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
......@@ -79,7 +79,7 @@
<div class="col">
<div class="provider_data_content">
<p> {{'currencyadd.Forex Amount Start From' | translate}}</p>
<p> {{'currencyadd.Forex Multiple' | translate}}</p>
<input class="provider_input" placeholder="" type="number" formControlName="start_from">
</div>
<div class="s_error" *ngIf="!currencyForm.controls['start_from'].valid && currencySubmit">
......
src/app/checker/currency-edit/currency-edit.component.html
......@@ -26,7 +26,7 @@
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'currencyedit.Success!' | translate}}</strong> {{'currencyedit.Currency added successfully.' | translate}}
<strong> {{'currencyedit.Success!' | translate}}</strong> {{'currencyedit.Currency updated successfully' | translate}}
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
......
src/app/checker/currency-list/currency-list.component.html
......@@ -29,7 +29,7 @@
</div>
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'currencylist.Success!' | translate}}</strong> {{'currencylist.Currency removed successfully ' | translate}}
<strong> {{'currencylist.Success!' | translate}}</strong> {{'currencylist.Currency removed successfully' | translate}}
</div>
<table class="table">
<thead>
......@@ -37,7 +37,8 @@
<th> {{'currencylist.Name' | translate}}</th>
<th> {{'currencylist.Symbol' | translate}}</th>
<th> {{'currencylist.Rate' | translate}}</th>
<th> {{'currencylist.Forex Start from' | translate}}</th>
<th> {{'currencylist.Forex Multiple' | translate}}</th>
<th>{{'currencylist.Flag' | translate}}</th>
<th class="textRight">
<button class="add" (click)="goToPage('checker/currency_add')">+</button>
</th>
......@@ -49,6 +50,9 @@
<td>{{currency.symbol}}</td>
<td>{{currency.rate}}</td>
<td>{{currency.start_from}}</td>
<td>
<img [src]="getImage(currency.flag)" onerror="this.src= 'assets/images/asset_denied.png'">
</td>
<td class="textRight">
<button class="edit_btn"(click)="editClick(currency.id)"></button>
<button class="delete_btn" (click)="deleteClick(currency.id)"></button>
......
src/app/checker/currency-list/currency-list.component.ts
......@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { WebService } from './../../providers/web.service';
import { ValidationService } from './../../providers/validation.service';
import { ImageStorage } from '../../../environments/server.config';
@Component({
......@@ -100,4 +101,8 @@ export class CurrencyListComponent implements OnInit {
this.service.logout();
}
getImage(image_url) {
return ImageStorage + image_url;
}
}
src/app/checker/editforex/editforex.component.html
......@@ -24,11 +24,11 @@
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'editforex.Success! ' | translate}}</strong> {{'editforex.Provider updated successfully.' | translate}}
<strong> {{'editforex.Success!' | translate}}</strong> {{'editforex.Provider updated successfully' | translate}}
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'editforex.Warning! ' | translate}}</strong> {{responseMsg}}
<strong> {{'editforex.Warning!' | translate}}</strong> {{responseMsg}}
</div>
<form [formGroup]="providerForm" (ngSubmit)="editProcess()" autocomplete="off">
<div class="row">
......@@ -113,8 +113,8 @@
<div class="provider_data_content">
<p> {{'editforex.Status' | translate}}</p>
<select class="provider_input" formControlName="online_status">
<option value="1"> {{'editforex.Online' | translate}}</option>
<option value="0"> {{'editforex.Offline' | translate}}</option>
<option value="1"> Online</option>
<option value="0"> Offline</option>
</select>
</div>
<div class="s_error" *ngIf="!providerForm.controls['online_status'].valid && providerSubmit">
......
src/app/checker/editprovider/editprovider.component.html
......@@ -4,7 +4,7 @@
<header class="provider_header">
<div class="row">
<div class="col-md-6">
<h4> {{'editprovider.Forex Delivery Service Provider ' | translate}}</h4>
<h4> {{'editprovider.Forex Delivery Service Provider' | translate}}</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('checker/home')">
......@@ -24,7 +24,7 @@
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'editprovider.Success!' | translate}}</strong> {{'editprovider.Provider updated successfully.' | translate}}
<strong> {{'editprovider.Success!' | translate}}</strong> {{'editprovider.Provider updated successfully' | translate}}
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
......@@ -34,7 +34,7 @@
<div class="row">
<div class="col">
<div class="provider_data_content" *ngIf="provider">
<p> {{'editprovider.Provider Name ' | translate}}</p>
<p> {{'editprovider.Provider Name' | translate}}</p>
<input class="provider_input" placeholder="" type="text" disabled [value]="provider.name">
</div>
</div>
......@@ -51,7 +51,7 @@
<div class="col">
<div class="provider_data_content" *ngIf="provider">
<p> {{'editprovider.CR ID' | translate}}</p>
<input class="provider_input" placeholder="" type="text" disabled [value]="provider.cr_id">
<input class="provider_input" placeholder="" type="text" disabled [value]="provider.cr_id" maxlength="10">
</div>
</div>
</div>
......@@ -80,15 +80,15 @@
<div class="col">
<div class="provider_data_content">
<p> {{'editprovider.Phone' | translate}}</p>
<input class="provider_input" placeholder="" type="number" formControlName="phone">
<input class="provider_input" placeholder="" type="number" formControlName="phone" maxlength="10">
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerForm.controls['phone'].touched">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('pattern')">{{error_msg.phone}}</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerForm.controls['phone'].touched && !providerForm.controls['phone'].hasError('pattern')">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('maxlength')">{{error_msg.maxLength}} 15</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('minlength')">{{error_msg.minLength}} 8</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('maxlength')">{{error_msg.maxLength}} 10</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('minlength')">{{error_msg.minLength}} 10</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('required')">{{error_msg.required}} </div>
......
src/app/checker/editprovider/editprovider.component.ts
......@@ -18,7 +18,7 @@ export class EditproviderComponent implements OnInit {
success: boolean;
loader: boolean;
providerForm: FormGroup;
mobnumPattern = '^((\\+?)|0)?[0-9]{8,15}$';
mobnumPattern = '^((\\+?)|0)?[0-9]{9,10}$';
emailPattern = '^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$';
providerSubmit: boolean;
error_msg: any[];
......
src/app/delivery/add-driver/add-driver.component.html
......@@ -26,11 +26,11 @@
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'adddriver.Success!' | translate}}</strong> {{'adddriver.Provider created successfully.' | translate}}
<strong> {{'adddriver.Success!' | translate}}</strong> {{'adddriver.Provider created successfully' | translate}}
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>{{'adddriver.Warning! ' | translate}}</strong> {{responseError}}
<strong>{{'adddriver.Warning!' | translate}}</strong> {{responseError}}
</div>
<form [formGroup]="providerForm" (ngSubmit)="regProcess()" autocomplete="off">
<div class="row">
......@@ -84,6 +84,9 @@
<div class="s_error" *ngIf="!providerForm.controls['cr_id'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['cr_id'].hasError('required')">{{error_msg.required}} </div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['cr_id'].valid && providerForm.controls['cr_id'].touched">
<div class="s_validation" *ngIf="providerForm.controls['cr_id'].hasError('pattern')">{{error_msg.crId}}</div>
</div>
</div>
<div class="col">
<div class="provider_data_content">
......@@ -117,8 +120,8 @@
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerForm.controls['phone'].touched && !providerForm.controls['phone'].hasError('pattern')">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('maxlength')">{{error_msg.maxLength}} 15</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('minlength')">{{error_msg.minLength}} 8</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('maxlength')">{{error_msg.maxLength}} 10</div>
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('minlength')">{{error_msg.minLength}} 10</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['phone'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('required')">{{error_msg.required}} </div>
......
src/app/delivery/add-driver/add-driver.component.ts
......@@ -11,7 +11,8 @@ import { FormControl, FormGroup, FormBuilder, Validators, ValidationErrors } fro
})
export class AddDriverComponent implements OnInit {
providerForm: FormGroup;
mobnumPattern = '^((\\+?)|0)?[0-9]{8,15}$';
mobnumPattern = '^((\\+?)|0)?[0-9]{9,10}$';
crId = '^((\\+?)|0)?[0-9]{10}$';
emailPattern = '^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$';
providerSubmit: boolean;
lang = 'en';
......@@ -45,7 +46,7 @@ export class AddDriverComponent implements OnInit {
this.providerForm = this.formBuilder.group({
'name': ['', Validators.compose([Validators.required])],
'cr_manager': ['', Validators.compose([Validators.required])],
'cr_id': ['', Validators.compose([Validators.required])],
'cr_id': ['', Validators.compose([Validators.required, Validators.pattern(this.crId)])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
// tslint:disable-next-line:max-line-length
......@@ -82,6 +83,7 @@ export class AddDriverComponent implements OnInit {
this.success = true;
this.providerSubmit = false;
this.providerForm.reset();
this.providerForm.controls['type'].setValue(4);
} else {
this.error = true;
this.responseError = this.vs.errorCode[this.lang][response.errorCode];
......
src/app/delivery/edit-driver/edit-driver.component.html
......@@ -24,7 +24,7 @@
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'editdriver.Success!' | translate}}</strong> {{'editdriver.Forex Delivery Driver updated successfully.' | translate}}
<strong> {{'editdriver.Success!' | translate}}</strong> {{'editdriver.Forex Delivery Driver updated successfully' | translate}}
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
......
src/app/delivery/editprovider/editprovider.component.html
......@@ -24,7 +24,7 @@
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'editprovider.Success!' | translate}}</strong> {{'editprovider.Provider updated successfully. ' | translate}}
<strong> {{'editprovider.Success!' | translate}}</strong> {{'editprovider.Provider updated successfully' | translate}}
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
......
src/app/delivery/transaction/transaction.component.html
......@@ -27,11 +27,11 @@
<div class="provider_inner_content">
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'transaction.Warning!' | translate}}</strong> {{responseMsg}}
<strong> {{'transaction.Warning' | translate}}</strong> {{responseMsg}}
</div>
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong> {{'transaction.Success!' | translate}}</strong> {{'transaction.Forex provider removed successfully' | translate}}
<strong> {{'transaction.Success' | translate}}</strong> {{'transaction.Forex provider removed successfully' | translate}}
</div>
<div class="table-responsive">
<table class="table">
......@@ -57,7 +57,7 @@
<td>{{tansaction.currency}}</td>
<td>SAR {{tansaction.amount}}</td>
<td>{{tansaction.symbol + tansaction.convert_price}}</td>
<td>&nbsp;</td>
<td>{{tansaction.book_date}}</td>
<td>{{getCustomer(tansaction.driver_info,'name') | titlecase}}</td>
<td>{{get_status(tansaction.status)}}</td>
<td><button class="edit_btn" data-toggle="modal" data-target="#edit" (click)="assignClick(i)" *ngIf="tansaction.status !=3 && tansaction.status !=0"></button></td>
......@@ -83,7 +83,7 @@
<div class="forex_modal_wrapper">
<div class="alert alert-danger alert-dismissible" *ngIf="assignError">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>{{'transaction.Warning! ' | translate}}</strong> {{'transaction. Assign Driver failed' | translate}}
<strong>{{'transaction.Warning!' | translate}}</strong> {{'transaction. Assign Driver failed' | translate}}
</div>
<div class="forex_modal_header">
<h5 class="floatLeft"> {{'transaction.Assign Driver' | translate}}</h5>
......
src/app/forex/currency/currency.component.html
......@@ -29,6 +29,7 @@
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>{{'currency.Success' | translate}}!</strong>{{'currency.Currency assigned successfully' | translate}}
</div>
<form [formGroup]="currencyForm" novalidate (ngSubmit)="currency_assign()">
<div class="row">
<div class="col-md-6">
<div class="row">
......@@ -57,9 +58,10 @@
</div>
</div>
</div>
<div class="col-md-2"></div>
<div class="col-md-4">
<form [formGroup]="currencyForm" novalidate (ngSubmit)="currency_assign()">
<div class="row">
<div class="col-md-12">
<p>{{'currency.Save' | translate}}Rates</p>
......@@ -89,7 +91,7 @@
<input class="" type="number">
</div>
</div> -->
</form>
</div>
</div>
<div class="row" *ngIf="selectedList.length > 0">
......@@ -101,6 +103,7 @@
</div>
</div>
</div>
</form>
</div>
</div>
......
src/app/forex/editprovider/editprovider.component.html
......@@ -113,8 +113,8 @@
<div class="provider_data_content">
<p>{{'editprovider.Status' | translate}}</p>
<select class="provider_input" formControlName="online_status">
<option value="1">{{'editprovider.Online' | translate}}</option>
<option value="0">{{'editprovider.Offline' | translate}}</option>
<option value="1">Online</option>
<option value="0">Offline</option>
</select>
</div>
<div class="s_error" *ngIf="!providerForm.controls['online_status'].valid && providerSubmit">
......
src/app/forex/transaction/transaction.component.html
......@@ -38,6 +38,7 @@
<thead>
<tr>
<th>{{'transaction.User Info' | translate}}</th>
<th>{{'transaction.Date' | translate}}</th>
<th>{{'transaction.Phone' | translate}}</th>
<th>{{'transaction.Location' | translate}}</th>
<th>{{'transaction.Currency' | translate}}</th>
......@@ -50,6 +51,7 @@
<tbody *ngIf="transactionList">
<tr *ngFor="let tansaction of transactionList">
<td>{{getCustomer(tansaction.user_info,'name') | titlecase}}</td>
<td>{{tansaction.book_date}}</td>
<td>{{getCustomer(tansaction.user_info,'phone') | titlecase}}</td>
<td>{{getCustomer(tansaction.user_info,'location') | titlecase}}</td>
<td>{{tansaction.currency}}</td>
......
src/app/providers/validation.service.ts
......@@ -20,7 +20,8 @@ export class ValidationService {
'min': 'العمر الأدنى تبدأ في',
'max': 'العمر القصوى في نهاية',
'confirm': 'عدم تطابق كلمة المرور',
'pattern': 'نمط غير صالح'
'pattern': 'نمط غير صالح',
'crId': 'Invalid CR ID'
};
this.errorList['en'] = {
'required': 'This field is required',
......@@ -32,7 +33,8 @@ export class ValidationService {
'min': 'Age min start at ',
'max': 'Age max end at ',
'confirm': 'Password mismatch',
'pattern': 'Invalid Pattern'
'pattern': 'Invalid Pattern',
'crId': 'Invalid CR ID'
};
this.errorCode['en'] = {
......
src/app/start/login/login.component.html
......@@ -41,7 +41,7 @@
<div class="login_row">
<h6 (click)="goToPage('start/forgot')">{{'login.Forgot Password' | translate}}</h6>
</div>
<div class="login_row">
<!---div class="login_row">
<p class="textCenter" style="text-align:center !important;">{{'login.Choose Language' | translate}}</p>
<br>
......@@ -49,7 +49,7 @@
<option value="0" selected>English</option>
<option value="1">Arabic</option>
</select>
</div>
</div-->
</div>
</div>
</div>
......
src/app/start/login/login.component.ts
......@@ -43,7 +43,7 @@ export class LoginComponent implements OnInit {
) {
//this.language.nativeElement.value = this.service.getLocalStorageItem('lang');
this.lang = this.service.getLocalStorageItem('lang');
//this.lang = this.service.getLocalStorageItem('lang');
this.error_msg = this.vs.errorList[this.lang];
console.log(this.error_msg);
this.passwordErr = false;
......
src/assets/i18n/en.json
......@@ -22,11 +22,11 @@
"Save": "Save"
},
"addforex":{
"Forex Delivery Service Provider" :"Forex Delivery Service Provider",
"Forex Delivery Service Provider" :"Forex Provider",
"Change PIN":"Change PIN",
"Home" : "Home",
"Logout":"Logout",
"Add Delivery Provider":"Add Delivery Provider",
"Add Delivery Provider":"Add Provider",
"Success!":"Success",
"Provider created successfully":"Provider created successfully",
"Warning":"Warning",
......@@ -89,7 +89,7 @@
"Symbol":"Symbol",
"Flag":"Flag",
"Rate":"Rate",
"Forex Amount Start From":"Forex Amount Start From",
"Forex Multiple":"Forex Multiple",
"Cancel":"Cancel",
"Save":"Save"
},
......@@ -100,7 +100,7 @@
"Change PIN":"Change PIN",
"Edit Currency":"Edit Currency",
"Success!":"Success!",
"Currency added successfully":"Currency added successfully",
"Currency updated successfully":"Currency Updated successfully",
"Warning!":"Warning!",
"Name":"Name",
"Symbol":"Symbol",
......@@ -114,6 +114,7 @@
"currencylist":{
"Manage Currency":"Manage Currency",
"Home" :"Home",
"Flag":"Flag",
"Logout":"Logout",
"Change PIN":"Change PIN",
"Currency List":"Currency List",
......@@ -122,7 +123,7 @@
"Currency removed successfully":"Currency removed successfully",
"Name":"Name",
"Symbol":"Symbol",
"Forex Start from":"Forex Start from",
"Forex Multiple":"Forex Multiple",
"Rate":"Rate"
},
"editforex":{
......@@ -223,7 +224,7 @@
"Warning!":"Warning!",
"Success!":"Success!",
"Provider created successfully.":"Provider created successfully.",
"Provider Name":"Provider Name",
"Provider Name":"Driver Name",
"Pin":"Pin",
"Location":"Location",
"National ID":"National ID",
......@@ -243,7 +244,7 @@
"Warning!":"Warning!",
"Success!":"Success!",
"Forex Delivery Driver updated successfully":"Forex Delivery Driver updated successfully",
"Provider Name":"Provider Name",
"Provider Name":"Driver Name",
"Location":"Location",
"National ID":"National ID",
"Manager ID":"Manager ID",
......
src/styles.scss
......@@ -731,6 +731,16 @@ section.module.parallax {
td{
padding:10px !important;
text-align: center !important;
img{
display: inline-block;
width: 30px;
height: 30px;
border-radius: 50%;
border: 2px solid #b4b4b4;
-o-object-fit: cover;
object-fit: cover;
margin-right: 10px;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment