Merge branch 'sultan26April' into Fatima-Q2-June

MOHEMM-SFH-COLORS
umasoodch 4 years ago
commit 23d926db90

@ -114,7 +114,6 @@
<plugin name="cordova-plugin-ionic-webview" spec="4.1.0">
<variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
</plugin>
<plugin name="cordova-android-support-gradle-release" spec="^3.0.1" />
<plugin name="cordova-sqlite-storage" spec="^3.4.0" />
<plugin name="cordova-plugin-nativestorage" spec="^2.3.2" />
<plugin name="cordova-plugin-ble-central" spec="^1.2.4" />

@ -37,7 +37,7 @@
"@ionic-native/file": "^5.18.0",
"@ionic-native/file-path": "^5.18.0",
"@ionic-native/fingerprint-aio": "^5.18.0",
"@ionic-native/firebase-x": "^5.21.5",
"@ionic-native/firebase-x": "^5.34.0",
"@ionic-native/geolocation": "^5.10.0",
"@ionic-native/globalization": "^5.18.0",
"@ionic-native/health": "^5.4.0",
@ -82,7 +82,7 @@
"cordova-plugin-file": "^6.0.2",
"cordova-plugin-filepath": "^1.5.6",
"cordova-plugin-fingerprint-aio": "^3.0.0",
"cordova-plugin-firebasex": "^7.0.2",
"cordova-plugin-firebasex": "^13.0.0",
"cordova-plugin-geolocation": "^4.0.2",
"cordova-plugin-globalization": "^1.11.0",
"cordova-plugin-inappbrowser": "^3.1.0",
@ -172,9 +172,6 @@
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
"cordova-android-support-gradle-release": {
"ANDROID_SUPPORT_VERSION": "27.+"
},
"cordova.plugins.diagnostic": {
"ANDROID_SUPPORT_VERSION": "28.+"
},
@ -197,20 +194,6 @@
"cordova-plugin-fingerprint-aio": {
"FACEID_USAGE_DESCRIPTION": "User Authentication"
},
"cordova-plugin-firebasex": {
"FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true",
"FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true",
"FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true",
"ANDROID_ICON_ACCENT": "#FF00FFFF",
"ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0",
"ANDROID_FIREBASE_ANALYTICS_VERSION": "17.2.1",
"ANDROID_FIREBASE_MESSAGING_VERSION": "20.0.0",
"ANDROID_FIREBASE_CONFIG_VERSION": "19.0.3",
"ANDROID_FIREBASE_PERF_VERSION": "19.0.1",
"ANDROID_FIREBASE_AUTH_VERSION": "19.1.0",
"ANDROID_CRASHLYTICS_VERSION": "2.10.1",
"ANDROID_CRASHLYTICS_NDK_VERSION": "2.1.1"
},
"cordova-plugin-androidx": {},
"cordova-plugin-androidx-adapter": {},
"cordova-plugin-background-geolocation": {
@ -218,11 +201,37 @@
},
"phonegap-nfc": {},
"wifiwizard2": {},
"cordova-plugin-x-socialsharing": {}
"cordova-plugin-x-socialsharing": {},
"cordova-plugin-firebasex": {
"FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true",
"FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true",
"FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true",
"ANDROID_ICON_ACCENT": "#FF00FFFF",
"ANDROID_FIREBASE_PERFORMANCE_MONITORING": "false",
"ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0",
"ANDROID_PLAY_SERVICES_AUTH_VERSION": "19.0.0",
"ANDROID_FIREBASE_ANALYTICS_VERSION": "19.0.0",
"ANDROID_FIREBASE_MESSAGING_VERSION": "22.0.0",
"ANDROID_FIREBASE_CONFIG_VERSION": "21.0.0",
"ANDROID_FIREBASE_PERF_VERSION": "20.0.1",
"ANDROID_FIREBASE_AUTH_VERSION": "21.0.1",
"ANDROID_FIREBASE_INAPPMESSAGING_VERSION": "20.0.0",
"ANDROID_FIREBASE_FIRESTORE_VERSION": "23.0.1",
"ANDROID_FIREBASE_FUNCTIONS_VERSION": "20.0.0",
"ANDROID_FIREBASE_IID_VERSION": "21.1.0",
"ANDROID_FIREBASE_INSTALLATIONS_VERSION": "17.0.0",
"ANDROID_FIREBASE_CRASHLYTICS_VERSION": "18.0.1",
"ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION": "18.0.1",
"ANDROID_GSON_VERSION": "2.8.7",
"ANDROID_FIREBASE_PERF_GRADLE_PLUGIN_VERSION": "1.4.0"
},
"cordova-android-support-gradle-release": {
"ANDROID_SUPPORT_VERSION": "27.+"
}
},
"platforms": [
"android",
"ios"
]
}
}
}

@ -39,6 +39,7 @@ import { Router } from '@angular/router';
import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
import { NFC, Ndef } from "@ionic-native/nfc/ngx"
import { DigitalIdComponent } from '../authentication/digital-id/digital-id.component';
import { FirebaseX } from '@ionic-native/firebase-x/ngx';
@Component({
selector: 'app-home',
@ -158,7 +159,8 @@ export class HomePage implements OnInit {
private platform: Platform,
public backgroundGeolocation: BackgroundGeolocation,
public modalController: ModalController,
private nfc: NFC
private nfc: NFC,
public firebasex: FirebaseX
) {
this.events.subscribe('img-change', displayImg => {
this.userImage = this.sanitizer.bypassSecurityTrustUrl(
@ -188,6 +190,27 @@ export class HomePage implements OnInit {
}
}
testy() {
// var logMessage = 'testing';
// var stackTrace = null;
// this.firebasex.logError(logMessage, stackTrace).then( result => {
// console.log('posted successfully;');
// });
var document = {
"a_string": "foo",
"a_list": [1, 2, 3],
"an_object": {
"an_integer": 1,
}
};
var collection = "test";
this.firebasex.addDocumentToFirestoreCollection(document, collection, function(documentId){
console.log("Successfully added document with id="+documentId);
}, function(error){
console.error("Error adding document: "+error);
});
}
ionViewWillEnter() {
this.common.startLoading();
this.common.sharedService.setSharedData(true, 'loadWorkList');

@ -17,6 +17,7 @@
<div class="header"></div>
<div class="bottom"></div>
<div class="md-stepper-horizontal ">
<ion-row>
<ion-col size="4"> <div class="md-step active " [ngClass]="step >1 ? 'green' : 'orange'">
<div class="md-step-circle"><span style="content: url(/assets/imgs/check-white.svg)"></span></div>
<div class="md-step-title">{{ts.trPK('itemforsale','select-category')}}</div>
@ -25,6 +26,7 @@
<!-- <div class="md-step-bar-right" [ngClass]="step ==1 ? 'orange-border' : 'green-border'"></div> -->
</div>
</ion-col>
<ion-col size="4"> <div class="md-step" [ngClass]="step >2 ? 'green' : step ==2 ? 'orange' : 'grey'">
<div class="md-step-circle"><span *ngIf="step==1" style="content: url(/assets/imgs/check.svg)"></span>
<span *ngIf="step>2 || step==2" style="content: url(/assets/imgs/check-white.svg)">
@ -44,6 +46,7 @@
<div class="md-step-bar-left"></div>
</div></ion-col>
</ion-row>
</div>
<div class="content">
@ -77,7 +80,7 @@
<ion-col size="4">
<div class="sale-icon">
<div class="top">
<img src="/assets/imgs/itemsforsale/electronic appliances.svg">
<img src="/assets/imgs/itemsforsale/electronic_appliances.svg">
</div>
<div class="bottom-icon">
<p>Electronic Applicance</p>
@ -183,7 +186,7 @@
<div class="image-container">
<div class="uploaded">
<div class="closed">X</div>
<img src="assets/imgs/itemsforsale/fashion .svg" />
<img src="assets/imgs/itemsforsale/fashion.svg" />
</div>
</div>
@ -192,7 +195,7 @@
<div class="image-container">
<div class="uploaded">
<div class="closed">X</div>
<img src="assets/imgs/itemsforsale/fashion .svg" />
<img src="assets/imgs/itemsforsale/fashion.svg" />
</div>
</div>
@ -229,15 +232,15 @@
<div class="description-details">
<p class="orange">Used</p>
<img src="assets/imgs/itemsforsale/fashion .svg" />
<img src="assets/imgs/itemsforsale/fashion .svg" />
<img src="assets/imgs/itemsforsale/fashion.svg" />
<img src="assets/imgs/itemsforsale/fashion.svg" />
<div class="selling">
<strong>Selling for </strong> <h2>500 SAR</h2>
</div>
<div class="waring">
<img src="/assets/imgs/itemsforsale/alert.svg"> This ad will be valid for 2 week after approval
<img src="/assets/imgs/itemsforsale/alert.svg"> <label>This ad will be valid for 2 week after approval</label>
</div>
</div>

@ -10,9 +10,9 @@
border-radius: 25px;
}
.md-stepper-horizontal .md-step {
display:table-cell;
position:relative;
padding:20px 15px;
display: table-cell;
position: relative;
padding: 20px 10px;
text-align: left;
}
.md-stepper-horizontal .md-step:hover,
@ -48,7 +48,7 @@
z-index: 3;
}
.md-stepper-horizontal .md-step:last-child .md-step-circle {
margin-left:20px
margin-left:0px
}
.md-stepper-horizontal.green .md-step.active .md-step-circle {
background-color:#00AE4D;
@ -88,6 +88,7 @@ margin-left:20px
.md-stepper-horizontal .md-step .md-step-optional {
text-align: center;
color:rgba(0,0,0,.26);
margin-left:0 ;
}
.md-stepper-horizontal .md-step.orange .md-step-title, .md-stepper-horizontal .md-step.green .md-step-title {
font-weight: 600;
@ -107,13 +108,14 @@ margin-left:20px
top: 36px;
height: 2px;
background: #DDDDDD;
width: 95%;
width: 120px;
z-index: 0;
left: 25px;
}
.md-stepper-horizontal .md-step .md-step-bar-left {
margin-right: 0px;
left: 58%;
left: 40%;
}
.orange .md-step-bar-left {
background:#CC9B14 !important;
@ -154,6 +156,7 @@ font-weight: bold;
color: #ffffff !important;
padding:2px 5px 2px 5px;
border-radius: 5px;
margin-left:0 ;
}
.green .md-step-optional{
font-size: 12px;
@ -273,8 +276,15 @@ position: relative;
font-size: 10px;
}
.waring label{
font-size: 11px;
padding: 0px 10px;
display: inline-block;
position: relative;
position: absolute;
}
.waring img{
margin: 0 10px;
margin: 0px;
}
.selling h2{
display: inline-block;

@ -73,7 +73,7 @@ ion-footer{
bottom: 0;
}
.icon-footer{
margin: 6px;
position: absolute;
left: 35px;
margin: 0px;
position: relative;
left: -10px;
}

@ -85,8 +85,8 @@
</div>
</div>
<ion-row>
<div class="grid-row">
<ion-row >
<ion-col size="6" (click)="openDetails()">
<ion-card>
<ion-card-header>
@ -142,7 +142,7 @@
</ion-card>
</ion-col>
</ion-row>
</div>
</div>
<div class="my-ads" *ngIf="segment =='2'">

@ -100,6 +100,7 @@ ion-card-content p{
}
.my-ads .details-text{
font-size: 11px;
margin: 0;
}
.my-ads .yellow, .my-ads .green{
font-size: 11px;
@ -215,4 +216,7 @@ ion-card-content strong{
ion-fab-button{
height: 60px;
width: 60px;
}
.grid-row{
margin:10px;
}

@ -10,7 +10,7 @@
<ion-content>
<div class="container-icon" *ngIf="categories.length>0">
<ion-item *ngFor="let key of categories" (click)="filterOffers(key)" [ngClass]="{'active':activeClass==key.name }">
<ion-item lines="none" *ngFor="let key of categories" (click)="filterOffers(key)" [ngClass]="{'active':activeClass==key.name }">
<ion-label>
{{key.name}}
</ion-label>

@ -12,7 +12,7 @@ ion-thumbnail img{
top: 15px;
padding: 0px;
background: #3cc353;
padding: 3px 2px 2px 3px;
padding: 3px 2px 0px 3px;
border-radius: 60%;
font-size: 12px;
color: #fff;
@ -22,6 +22,11 @@ ion-thumbnail img{
text-align: center;
z-index: 2;
}
ion-item{
border-bottom: 1px solid #ccc;
--padding-start: 0px;
margin: 0 20px 4px 20px;
}
.footer-button{
background: var(--newgreen)!important;border-radius: 10px; --background: transparent;

@ -47,7 +47,7 @@
</div>
<div class="grid-container">
<ion-row>
<ion-col size="6" *ngFor="let item of offersData" (click)="openDetails(item)">
<ion-card class="offers-discount-card">
@ -79,6 +79,7 @@
</ion-col>
</ion-row>
</div>
</div>

@ -23,15 +23,17 @@
--border-radius: 25px;
}
.filterText{
margin: 5px 15px 5px;
padding: 0 4px 10px 5px;
font-size: 16px;
font-weight: bold;
margin: 0px 10px;
}
.container-icon{
padding: 0 10px 10px;
padding: 0 5px 10px;
position: relative;
white-space: nowrap;
overflow-x: auto;
margin: 0 10px;
}
.box-icon{
@ -111,13 +113,16 @@ ion-item{
--background: #fff;
margin: 10px;
border-radius: 25px;
padding: 5px;
padding: 0px;
}
ion-item h3{
color: #000;
font-weight: bold;
font-size: 16px;
}
.grid-container{
margin: 10px;
}
.yellow{
color:#ffc107;
}
@ -167,7 +172,7 @@ ion-content{
position: relative;
}
.top img{
width: 35px;
height: 35px;
margin: 5px 5px 0px 5px;
}
@ -179,7 +184,7 @@ ion-card-content{
padding: 0 15px 0px 15px;
}
ion-card{
margin: 0px;
margin: 3px;
--background: #fff;
--border-radius: 53px;
border-radius: 10px;

@ -58,7 +58,7 @@
</strong>
</p>
<ion-row *ngIf="related" class="related-offers-container">
<ion-col size="6" *ngFor="let item of related">
<ion-col size="6" *ngFor="let item of related" (click)="openRelated(item)">
<ion-card class="related-card">
<ion-card-header>
<div class="header-img" [ngStyle]="{'background-image': 'url(' + item.Banner_Image + ')'}" ></div>

@ -1,5 +1,5 @@
.header{
height: 150px;
height: 20%;
width: 100%;
position: absolute;
@ -130,6 +130,9 @@ ion-card{
background-repeat: no-repeat;
margin-top: 5px;
}
.related-offers-container{
margin: 10px;
}
.header-img-main{
height: 170px;
width: 100%;

@ -35,8 +35,16 @@ export class OfferDetailsComponent implements OnInit {
return temporalDivElement.textContent || temporalDivElement.innerText || "";
}
share() {
this.socialSharing.share(this.details.Description, this.details.Title, this.details.Banner_Image).then((result) => {
this.socialSharing.share(this.stripHtml(this.details.Description), this.stripHtml(this.details.Title), this.details.Banner_Image).then((result) => {
console.log(result);
})
}
openRelated(item) {
this.cs.sharedService.setSharedData(item, OfferDiscountService.selected_offers);
this.cs.back();
setTimeout(() => {
this.cs.navigateForward('/offersdiscount/offer-details');
}, 200);
}
}

@ -77,7 +77,7 @@ export class AddAddressComponent implements OnInit {
selectedCountryName: any;
public effectiveDate: any;
public submitAbsObjList: any = [];
public selectedStatus: any = {};
public isUpdate: boolean;
constructor(
public modalController: ModalController,
@ -141,12 +141,15 @@ export class AddAddressComponent implements OnInit {
ngAfterViewInit() {
console.log("ngAfterViewInit");
// console.log(this.containerDiv.nativeElement);
this.selectedStatus = this.cs.sharedService.getSharedData(ProfileService.SELECTED_STATUS);
var addressEntries = this.cs.sharedService.getSharedData(ProfileService.ADRESS_ENTRIES);
if (addressEntries && addressEntries.UPDATE_BUTTON === 'Y') {
this.isUpdate = true;
let countryDetail = this.cs.sharedService.getSharedData(ProfileService.COUNTRY);
this.selectedCountryName = countryDetail.name;
this.country = countryDetail.code;
} else {
this.isUpdate = false;
}
this.getEitDffStructure();
// this.addFieldToDOM(this.buttonInput, 'btnSubmit', this.cs.presentAlert('Clicked!'), true)
@ -1606,7 +1609,7 @@ export class AddAddressComponent implements OnInit {
EITTransactionTBL: this.arrValues,
P_COUNTRY_CODE: this.country,
P_EFFECTIVE_DATE: moment(this.effectiveDate).format('DD-MMM-YYYY'),
P_ACTION: 'NEW'
P_ACTION: this.selectedStatus.data == '1' ? 'CHANGE' : this.selectedStatus.data == '2' ? 'CORRECT' : 'NEW'
};
this.profileService

@ -122,8 +122,9 @@ export class AddBasicDetailsComponent implements OnInit {
ngOnInit() {}
ngAfterViewInit() {
this.getEitDffStructure();
// this.getColumnStructure();
// this.getEitDffStructure();
this.getColumnStructure();
}
public getColumnStructure() {
@ -156,10 +157,11 @@ export class AddBasicDetailsComponent implements OnInit {
this.drawEitFields(result.GetBasicDetColsStructureList);
}
}
public handleBasicDffStructureResult(result) {
if (result.GetEITDFFStructureList != null) {
this.eitResponse = result.GetEITDFFStructureList;
this.drawEitFields(result.GetEITDFFStructureList);
if (result.GetBasicDetDffStructureList != null) {
this.eitResponse = result.GetBasicDetDffStructureList;
this.drawEitFields(result.GetBasicDetDffStructureList);
}
}

@ -306,10 +306,12 @@ export class HomeComponent implements OnInit {
modal.onDidDismiss()
.then((data) => {
console.log(data);
this.cs.sharedService.setSharedData(data.data, ProfileService.SELECTED_STATUS);
if (data.data && data.data.data == 1) {
this.cs.sharedService.setSharedData(this.addressSubMenu, ProfileService.ADRESS_ENTRIES);
this.cs.sharedService.setSharedData(this.employeeAdress, ProfileService.EMP_ADDRESS);
this.cs.sharedService.setSharedData(this.country, ProfileService.COUNTRY);
this.cs.openAddAddress();
} else if (data.data && data.data.data == 2) {
this.cs.openAddAddress();

@ -34,6 +34,7 @@ export class ProfileService {
public static ADRESS_ENTRIES = 'address-entries';
public static EMP_ADDRESS = 'emp-address';
public static COUNTRY = 'country';
public static SELECTED_STATUS = 'selected-status';
constructor(
public con: ConnectorService,
public authService: AuthenticationService

Loading…
Cancel
Save