Merge branch 'master' into adarsh

package-lock.json

@@ -3759,12 +3759,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3779,17 +3781,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3906,7 +3911,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3918,6 +3924,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3932,6 +3939,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3939,12 +3947,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3963,6 +3973,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4043,7 +4054,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4055,6 +4067,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4176,6 +4189,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",

src/app/checker/addforex/addforex.component.html

@@ -8,6 +8,9 @@
       <h4>Forex Delivery Service Provider</h4>
     </div>
     <div class="col-md-6 textRight relative">
+        <button class="logout">
+            <img src="assets/images/asset_logout.png">
+          Logout</button>
         <img src="assets/images/asset_logo1.png">
         <span (click)="goToPage('delivery/changepin')">Change PIN</span>
     </div>
@@ -159,7 +162,8 @@
                       <div class="s_error" *ngIf="!providerForm.controls['deli_provider_id'].valid && providerSubmit">
                           <div class="s_validation" *ngIf="providerForm.controls['deli_provider_id'].hasError('required')">{{error_msg.required}} </div>
                       </div>
-                    </div>                  
+                    </div> 
+                    <div class="col"></div>                 
                 </div>
 
 

src/app/checker/addprovider/addprovider.component.html

@@ -8,6 +8,9 @@
       <h4>Forex Delivery Service Provider</h4>
     </div>
     <div class="col-md-6 textRight relative">
+        <button class="logout">
+            <img src="assets/images/asset_logout.png">
+          Logout</button>
         <img src="assets/images/asset_logo1.png">
         <span (click)="goToPage('delivery/changepin')">Change PIN</span>
     </div>

src/app/checker/currency-add/currency-add.component.html

@@ -8,6 +8,9 @@
       <h4>Currency Management</h4>
     </div>
     <div class="col-md-6 textRight relative">
+        <button class="logout">
+            <img src="assets/images/asset_logout.png">
+          Logout</button>
         <img src="assets/images/asset_logo1.png">
         <span (click)="goToPage('delivery/changepin')">Change PIN</span>
     </div>
@@ -76,6 +79,7 @@
                       <div class="s_validation" *ngIf="currencyForm.controls['start_from'].hasError('required')">{{error_msg.required}} </div>
                   </div>
                 </div> 
+                <div class="col"></div>
           </div>             
             <!-- <div class="row">
                 <div class="col">

src/app/checker/currency-edit/currency-edit.component.html

@@ -8,6 +8,9 @@
       <h4>Currency Management</h4>
     </div>
     <div class="col-md-6 textRight relative">
+        <button class="logout">
+            <img src="assets/images/asset_logout.png">
+          Logout</button>
         <img src="assets/images/asset_logo1.png">
         <span (click)="goToPage('delivery/changepin')">Change PIN</span>
     </div>
@@ -49,8 +52,11 @@
             <div class="col">
               <img [src]="getImage()" width="100" height="100" *ngIf="image_url" />
                 <div class="provider_data_content">
-                    <p>flag</p>
-                    <input class="provider_input" placeholder="" type="file"  formControlName="flag" (change)="onFileChange($event)">
+                    <p>Flag</p>
+                    <div class="provider_choose_btn">
+                  
+                      <input class="" placeholder="" type="file"  formControlName="flag" (change)="onFileChange($event)">
+                    </div>
                 </div>
                 <div class="s_error" *ngIf="!currencyForm.controls['flag'].valid && currencySubmit">
                     <div class="s_validation" *ngIf="currencyForm.controls['flag'].hasError('required')">{{error_msg.required}} </div>
@@ -77,6 +83,7 @@
                       <div class="s_validation" *ngIf="currencyForm.controls['start_from'].hasError('required')">{{error_msg.required}} </div>
                   </div>
                 </div> 
+                <div class="col"></div>
           </div>             
             <!-- <div class="row">
                 <div class="col">

src/app/checker/currency-edit/currency-edit.component.scss

@@ -59,6 +59,31 @@
                         outline: none;
                     }
                 }
+                .provider_choose_btn{
+                    input{
+                        border: 1px solid #b4b4b4;
+                    }
+                }
+
+                // .provider_choose_btn{
+                //     width: 130px;
+                //     background: #1a5c7c;
+                //     color: #fff;
+                //     position: relative;
+                //     height: 40px;
+                //     text-align: center;
+                //     padding: 7px;
+                //     border-radius: 20px; 
+                //     cursor: pointer;               
+                //     input{
+                //         position: absolute;
+                //         top:0px;
+                //         left:0px;
+                //         right:0px;
+                //         bottom: 0px;
+                //         opacity: 0;
+                //     }
+                // }
                 .provider_pin{
                     border:1px solid #b4b4b4;
                     height:40px;

src/app/checker/currency-edit/currency-edit.component.ts

@@ -43,7 +43,7 @@ export class CurrencyEditComponent implements OnInit {
       const parm = decodeURIComponent(this.route.snapshot.params['id']);
     // tslint:disable-next-line:radix
       const id = parseInt(parm);
-      this.getCurrency(id);
+      //this.getCurrency(id);
       this.currencyForm = this.formBuilder.group({
         'name':  ['', Validators.compose([Validators.required])],
         'symbol':  ['', Validators.compose([Validators.required])],

src/app/checker/currency-list/currency-list.component.html

@@ -7,6 +7,9 @@
         <h4>Manage Currency</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('checker/changepin')">Change PIN</span>
       </div>

src/app/checker/currency/currency.component.html

@@ -7,6 +7,9 @@
       <h4>Forex Delivery Service Provider</h4>
     </div>
     <div class="col-md-6 textRight relative">
+        <button class="logout">
+            <img src="assets/images/asset_logout.png">
+          Logout</button>
         <img src="assets/images/asset_logo1.png">
         <span (click)="goToPage('delivery/changepin')">Change PIN</span>
     </div>
@@ -62,8 +65,8 @@
               </div>
               
               <div formArrayName="currency">
-              <div class="row" *ngFor="let address of currencyForm.controls.currency.controls; let i=index" [formGroupName]="i">
-                <div class="col-md-6">
+              <div class="row">
+                <div class="col-md-6" *ngFor="let address of currencyForm.controls.currency.controls; let i=index" [formGroupName]="i">
                   <h6>{{selectedList[i].name}}</h6>
                    <input class="" type="hidden" formControlName="currency_id">
                   <input class="" type="number" formControlName="rate">                                          

src/app/checker/currency/currency.component.scss

@@ -76,6 +76,10 @@
                         margin-bottom: 3px;
                         cursor: pointer;
                     }
+                    .active{
+                        background: #a8a8a8;
+                        color: #fff;
+                    }
                 }
             }
             .add_btn{
@@ -105,8 +109,8 @@
                 border-radius:20px;
                 height:40px;
                 border:none;
-                padding-left:4%;
-                padding-right:4%;
+                padding-left:6%;
+                padding-right:6%;
                 margin:1%;
                 &:hover{
                     outline: none;
@@ -121,8 +125,8 @@
                 color: #fff;
                 border-radius:20px;
                 height:40px;
-                padding-left:4%;
-                padding-right:4%;
+                padding-left:6%;
+                padding-right:6%;
                 border:none;
                 margin:1%;
                 &:hover{

src/app/checker/editforex/editforex.component.html

@@ -7,6 +7,9 @@
         <h4>Forex Provider</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('checker/changepin')">Change PIN</span>
       </div>

src/app/checker/editprovider/editprovider.component.html

@@ -7,6 +7,9 @@
         <h4>Forex Delivery Service Provider</h4>
       </div>
       <div class="col-md-6 textRight relative">
+            <button class="logout">
+                    <img src="assets/images/asset_logout.png">
+                  Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('checker/changepin')">Change PIN</span>
       </div>

src/app/checker/forexprovider/forexprovider.component.html

@@ -7,6 +7,9 @@
         <h4>Forex Provider</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('checker/changepin')">Change PIN</span>
       </div>

src/app/checker/home/home.component.html

@@ -4,6 +4,9 @@
       <h4>Forex Delivery Service Provider</h4>
     </div>
     <div class="col-md-6 textRight relative">
+        <button class="logout">
+            <img src="assets/images/asset_logout.png">
+          Logout</button>
         <img src="assets/images/asset_logo1.png">
     </div>
   </div>

src/app/checker/index/index.component.html

 <div class="delivery_provider_content">
-        
   <router-outlet></router-outlet> 
 </div>

src/app/delivery/addprovider/addprovider.component.html

@@ -4,6 +4,9 @@
       <h4>Forex Delivery Service Provider</h4>
     </div>
     <div class="col-md-6 textRight relative">
+        <button class="logout">
+            <img src="assets/images/asset_logout.png">
+          Logout</button>
         <img src="assets/images/asset_logo1.png">
         <span (click)="goToPage('delivery/changepin')">Change PIN</span>
     </div>

src/app/delivery/editprovider/editprovider.component.html

@@ -19,6 +19,9 @@
         <h4>Forex Delivery Service Provider</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('delivery/changepin')">Change PIN</span>
       </div>

src/app/delivery/manageprovider/manageprovider.component.html

@@ -4,6 +4,9 @@
         <h4>Forex Delivery Service Provider</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('delivery/changepin')">Change PIN</span>
       </div>

src/app/delivery/transaction/transaction.component.html

@@ -4,6 +4,9 @@
         <h4>Delivery Transaction List</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('forex/changepin')">Change PIN</span>
       </div>

src/app/forex/addprovider/addprovider.component.html

@@ -4,6 +4,9 @@
       <h4>Forex Delivery Service Provider</h4>
     </div>
     <div class="col-md-6 textRight relative">
+        <button class="logout">
+            <img src="assets/images/asset_logout.png">
+          Logout</button>
         <img src="assets/images/asset_logo1.png">
         <span (click)="goToPage('forex/changepin')">Change PIN</span>
     </div>

src/app/forex/editprovider/editprovider.component.html

@@ -4,6 +4,9 @@
         <h4>Forex Delivery Service Provider</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('forex/changepin')">Change PIN</span>
       </div>

src/app/forex/manageprovider/manageprovider.component.html

@@ -4,6 +4,9 @@
         <h4>Forex Delivery Service Provider</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('forex/changepin')">Change PIN</span>
       </div>

src/app/forex/transaction/transaction.component.html

@@ -4,6 +4,9 @@
         <h4>Forex Transaction List</h4>
       </div>
       <div class="col-md-6 textRight relative">
+          <button class="logout">
+              <img src="assets/images/asset_logout.png">
+            Logout</button>
           <img src="assets/images/asset_logo1.png">
           <span (click)="goToPage('forex/changepin')">Change PIN</span>
       </div>

src/app/start/login/login.component.html

@@ -40,6 +40,15 @@
                <div class="login_row">
                   <h6 (click)="goToPage('start/forgot')">Forgot Password</h6>
                </div>
+               <div class="login_row">
+                     <p class="textCenter" style="text-align:center !important;">Choose Language</p>
+                     <br>
+                   
+                     <select id="translation" class="translation" (change)="changeLang($event.target.value)">
+                           <option value="0">English</option>
+                           <option value="1">Arabic</option>
+                         </select>
+               </div>
              </div>
           </div>
        </div>

src/app/start/login/login.component.scss

@@ -83,4 +83,11 @@
             }
         }
     }
+
+    .translation{
+        border: 1px solid #d8d8d8;
+        height: 40px;
+        padding-left: 10px;
+        padding-right: 10px;
+    }
 }
\ No newline at end of file

src/app/start/login/login.component.ts

@@ -4,6 +4,7 @@ import { ValidationService } from './../../providers/validation.service';
 import { SubjectService } from './../../providers/subject.service';
 import { WebService } from './../../providers/web.service';
 
+import * as $ from 'jquery';
 @Component({
   selector: 'app-login',
   templateUrl: './login.component.html',
@@ -87,6 +88,15 @@ export class LoginComponent implements OnInit {
     }
   }
 
+
+  changeLang(val: string) {
+    if (val === '1') {
+      $('body').addClass('ar');
+    } else {
+      $('body').removeClass('ar');
+    }
+  }
+
   processBack (e: any, el: any) {
     console.log(e);
     if (e.keyCode === 8) {

src/assets/styles/translation.scss

@@ -27,9 +27,15 @@
         h3{
             text-align: right;
         }
+        p{
+            text-align: right;
+        }
     }
     .provider_inner_content{
         direction: rtl;
+        h6{
+            text-align: right;
+        }
         .provider_data_content{
             text-align: right;
             p{

src/environments/server.config.ts

-// export const ImageStorage = 'http://forex.nuvento.com/';
+ //export const ImageStorage = 'http://forex.nuvento.com/';
 export const ImageStorage = 'http://localhost:3000/';
 export const apiConfig = 'http://localhost:3000/api/';
-// export const apiConfig = 'http://forex.nuvento.com/api/';
+ //export const apiConfig = 'http://forex.nuvento.com/api/';

src/index.html

@@ -8,7 +8,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
-<body class="">
+<body class="ar">
   <app-root></app-root>
 </body>
 </html>

src/styles.scss

@@ -633,3 +633,18 @@ section.module.parallax {
     }
   }
   
+.logout{
+    background: transparent;
+    color: #fff;
+    border:none;
+    font-size: 14px;
+    padding-left: 20px;
+    padding-right: 20px;
+    &:focus{
+        outline: none;
+    }
+    img{
+        width: 24px;
+        margin-right: 5px;
+    }
+}
\ No newline at end of file