Skip to content

G
getme
Commit db9ff2d9 by Adarsh K
Options

Merge branch 'adarsh' into 'master'

new changes See merge request !109
parents e8a8a769 016250bb
Showing with 143 additions and 132 deletions
.gitignore
...@@ -33,3 +33,4 @@ package-lock.json ...@@ -33,3 +33,4 @@ package-lock.json
Thumbs.db Thumbs.db
dist/ dist/
UserInterfaceState.xcuserstate UserInterfaceState.xcuserstate
config.xml
config.xml
...@@ -107,5 +107,4 @@ ...@@ -107,5 +107,4 @@
<plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" /> <plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" /> <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" /> <plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" />
<engine name="android" spec="8.1.0" />
</widget> </widget>
package-lock.json
...@@ -8408,9 +8408,9 @@ ...@@ -8408,9 +8408,9 @@
} }
}, },
"nopt": { "nopt": {
"version": "4.0.1", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
"requires": { "requires": {
"abbrev": "1", "abbrev": "1",
"osenv": "^0.1.4" "osenv": "^0.1.4"
...@@ -11377,9 +11377,9 @@ ...@@ -11377,9 +11377,9 @@
"dev": true "dev": true
}, },
"underscore": { "underscore": {
"version": "1.9.2", "version": "1.10.2",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
"integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==" "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="
}, },
"union-value": { "union-value": {
"version": "1.0.1", "version": "1.0.1",
......
package.json
{ {
"name": "getme", "name": "getme",
"version": "0.0.1", "version": "0.0.1",
"author": "Techware Software Solutions Pvt Ltd", "author": "Techware Software Solutions Pvt Ltd",
"homepage": "https://techware.com/", "homepage": "https://techware.com/",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@agm/core": "^1.1.0", "@agm/core": "^1.1.0",
"@angular/animations": "^8.2.14", "@angular/animations": "^8.2.14",
"@angular/common": "~8.1.2", "@angular/common": "~8.1.2",
"@angular/compiler": "~8.1.2", "@angular/compiler": "~8.1.2",
"@angular/core": "~8.1.2", "@angular/core": "~8.1.2",
"@angular/fire": "^5.3.0", "@angular/fire": "^5.3.0",
"@angular/forms": "~8.1.2", "@angular/forms": "~8.1.2",
"@angular/platform-browser": "~8.1.2", "@angular/platform-browser": "~8.1.2",
"@angular/platform-browser-dynamic": "~8.1.2", "@angular/platform-browser-dynamic": "~8.1.2",
"@angular/router": "~8.1.2", "@angular/router": "~8.1.2",
"@ionic-native/call-number": "^5.21.5", "@ionic-native/call-number": "^5.21.5",
"@ionic-native/core": "^5.19.1", "@ionic-native/core": "^5.19.1",
"@ionic-native/geolocation": "^5.19.1", "@ionic-native/geolocation": "^5.19.1",
"@ionic-native/google-plus": "^5.19.1", "@ionic-native/google-plus": "^5.19.1",
"@ionic-native/keyboard": "^5.21.6", "@ionic-native/keyboard": "^5.21.6",
"@ionic-native/native-geocoder": "^5.19.1", "@ionic-native/native-geocoder": "^5.19.1",
"@ionic-native/navigation-bar": "^5.21.6", "@ionic-native/navigation-bar": "^5.21.6",
"@ionic-native/social-sharing": "^5.20.0", "@ionic-native/social-sharing": "^5.20.0",
"@ionic-native/splash-screen": "^5.19.1", "@ionic-native/splash-screen": "^5.19.1",
"@ionic-native/status-bar": "^5.19.1", "@ionic-native/status-bar": "^5.19.1",
"@ionic/angular": "^4.11.8", "@ionic/angular": "^4.11.8",
"@ionic/storage": "^2.2.0", "@ionic/storage": "^2.2.0",
"@types/googlemaps": "^3.39.2", "@types/googlemaps": "^3.39.2",
"agm-direction": "^0.7.9", "agm-direction": "^0.7.9",
"call-number": "^1.0.1", "call-number": "^1.0.1",
"cordova-android": "8.1.0", "cordova-android": "^8.1.0",
"cordova-plugin-device": "^2.0.3", "cordova-plugin-device": "^2.0.3",
"cordova-plugin-geolocation": "^4.0.2", "cordova-plugin-geolocation": "^4.0.2",
"cordova-plugin-googleplus": "^8.4.0", "cordova-plugin-googleplus": "^8.4.0",
"cordova-plugin-ionic-keyboard": "^2.2.0", "cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^4.1.3", "cordova-plugin-ionic-webview": "^4.1.3",
"cordova-plugin-nativegeocoder": "^3.2.2", "cordova-plugin-nativegeocoder": "^3.2.2",
"cordova-plugin-navigationbar": "^1.0.31", "cordova-plugin-navigationbar": "^1.0.31",
"cordova-plugin-splashscreen": "^5.0.3", "cordova-plugin-splashscreen": "^5.0.3",
"cordova-plugin-statusbar": "^2.4.3", "cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.4", "cordova-plugin-whitelist": "^1.3.4",
"cordova-plugin-x-socialsharing": "^5.6.4", "cordova-plugin-x-socialsharing": "^5.6.4",
"cordova-sqlite-storage": "^3.4.1", "cordova-sqlite-storage": "^3.4.1",
"core-js": "^2.6.11", "core-js": "^2.6.11",
"elementtree": "^0.1.7", "elementtree": "^0.1.7",
"es6-promise-plugin": "^4.2.2", "es6-promise-plugin": "^4.2.2",
"firebase": "^7.6.1", "firebase": "^7.6.1",
"mx.ferreyra.callnumber": "0.0.2", "mx.ferreyra.callnumber": "0.0.2",
"properties-parser": "^0.3.1", "properties-parser": "^0.3.1",
"rxjs": "^6.5.4", "rxjs": "^6.5.4",
"rxjs-compat": "^6.5.4", "rxjs-compat": "^6.5.4",
"tslib": "^1.9.0", "tslib": "^1.9.0",
"zone.js": "~0.9.1" "zone.js": "~0.9.1"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/architect": "~0.801.2", "@angular-devkit/architect": "~0.801.2",
"@angular-devkit/build-angular": "~0.801.2", "@angular-devkit/build-angular": "~0.801.2",
"@angular-devkit/core": "~8.1.2", "@angular-devkit/core": "~8.1.2",
"@angular-devkit/schematics": "~8.1.2", "@angular-devkit/schematics": "~8.1.2",
"@angular/cli": "~8.1.2", "@angular/cli": "~8.1.2",
"@angular/compiler": "~8.1.2", "@angular/compiler": "~8.1.2",
"@angular/compiler-cli": "~8.1.2", "@angular/compiler-cli": "~8.1.2",
"@angular/language-service": "~8.1.2", "@angular/language-service": "~8.1.2",
"@ionic/angular-toolkit": "~2.0.0", "@ionic/angular-toolkit": "~2.0.0",
"@types/jasmine": "~3.3.8", "@types/jasmine": "~3.3.8",
"@types/jasminewd2": "^2.0.8", "@types/jasminewd2": "^2.0.8",
"@types/node": "~8.9.4", "@types/node": "~8.9.4",
"codelyzer": "^5.2.1", "codelyzer": "^5.2.1",
"jasmine-core": "~3.4.0", "jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0", "karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0", "karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1", "karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1", "karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.5.1", "karma-jasmine-html-reporter": "^1.5.1",
"protractor": "~5.4.0", "protractor": "~5.4.0",
"ts-node": "~7.0.0", "ts-node": "~7.0.0",
"tslint": "~5.15.0", "tslint": "~5.15.0",
"typescript": "~3.4.3" "typescript": "~3.4.3"
}, },
"description": "An Ionic project", "description": "An Ionic project",
"cordova": { "cordova": {
"plugins": { "plugins": {
"cordova-plugin-whitelist": {}, "cordova-plugin-whitelist": {},
"cordova-plugin-statusbar": {}, "cordova-plugin-statusbar": {},
"cordova-plugin-device": {}, "cordova-plugin-device": {},
"cordova-plugin-splashscreen": {}, "cordova-plugin-splashscreen": {},
"cordova-plugin-ionic-webview": { "cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
"cordova-plugin-geolocation": {
"GEOLOCATION_USAGE_DESCRIPTION": "To locate you"
},
"cordova-plugin-nativegeocoder": {},
"cordova-sqlite-storage": {},
"cordova-plugin-googleplus": {
"REVERSED_CLIENT_ID": "com.googleusercontent.apps.949385251610-a6lrfr6uhr73991e38t3t013jj3v56a9",
"PLAY_SERVICES_VERSION": "15.0.1"
},
"cordova-plugin-x-socialsharing": {
"ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
},
"mx.ferreyra.callnumber": {},
"call-number": {},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-navigationbar": {}
}, },
"cordova-plugin-geolocation": { "platforms": [
"GEOLOCATION_USAGE_DESCRIPTION": "To locate you" "android"
}, ]
"cordova-plugin-nativegeocoder": {}, }
"cordova-sqlite-storage": {},
"cordova-plugin-googleplus": {
"REVERSED_CLIENT_ID": "com.googleusercontent.apps.949385251610-a6lrfr6uhr73991e38t3t013jj3v56a9",
"PLAY_SERVICES_VERSION": "15.0.1"
},
"cordova-plugin-x-socialsharing": {
"ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
},
"mx.ferreyra.callnumber": {},
"call-number": {},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-navigationbar": {}
},
"platforms": [
"android"
]
}
} }
\ No newline at end of file
src/app/cart/cart.page.ts
...@@ -138,10 +138,10 @@ export class CartPage implements OnInit { ...@@ -138,10 +138,10 @@ export class CartPage implements OnInit {
} }
getDeliveryCharge(amount) { getDeliveryCharge(amount) {
if (amount >= 150) { if (amount >= this.service.minAmount) {
this.deliveryCharge = 0; this.deliveryCharge = 0;
} else { } else {
this.deliveryCharge = 2.99; this.deliveryCharge = this.service.deliFee;
} }
return this.deliveryCharge.toFixed(2); return this.deliveryCharge.toFixed(2);
} }
......
src/app/nearby/nearby.page.html
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="zoom" <agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="zoom"
[backgroundColor]="'rgba(29, 27, 130,0.2)'" (mapReady)="mapReady($event)" [backgroundColor]="'rgba(29, 27, 130,0.2)'" (mapReady)="mapReady($event)"
(centerChange)="centerChange($event)"> (centerChange)="centerChange($event)">
<agm-marker [markerDraggable]="true" (dragEnd)="markerDragEnd($event)" [iconUrl]=" <agm-marker [markerDraggable]="true" [iconUrl]="
{ {
url: './assets/pin.svg', url: './assets/pin.svg',
scaledSize: { scaledSize: {
......
src/config/service.service.ts
...@@ -11,6 +11,8 @@ export class ServiceService { ...@@ -11,6 +11,8 @@ export class ServiceService {
distance: any; distance: any;
popupMsg: any; popupMsg: any;
popupSub: any; popupSub: any;
deliFee: number;
minAmount: number;
constructor( constructor(
public storage: Storage, public storage: Storage,
public toastController: ToastController public toastController: ToastController
...@@ -19,15 +21,21 @@ export class ServiceService { ...@@ -19,15 +21,21 @@ export class ServiceService {
this.popupSub = ''; this.popupSub = '';
this.state = true; this.state = true;
this.distance = 10; this.distance = 10;
this.deliFee = 7.99;
this.minAmount = 50;
this.storage.ready().then(() => { this.storage.ready().then(() => {
this.get('user'); this.get('user');
}); });
this.setting().then((data) => { this.setting().then((data: any) => {
if (data) { if (data) {
this.distance = data; this.distance = data.distance;
this.minAmount = data.minAmount;
this.deliFee = data.deliFee;
} }
}).catch(err => { }).catch(err => {
this.distance = 10; this.distance = 10;
this.deliFee = 7.99;
this.minAmount = 50;
}); });
} }
...@@ -104,7 +112,9 @@ export class ServiceService { ...@@ -104,7 +112,9 @@ export class ServiceService {
if (doc.exists) { if (doc.exists) {
const data = doc.data(); const data = doc.data();
this.distance = data.distance; this.distance = data.distance;
resolve(this.distance); this.deliFee = data.deliFee;
this.minAmount = data.minAmount;
resolve(data);
} }
}); });
}); });
......
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