Unverified Commit 9117a370 authored by Alexander Savov's avatar Alexander Savov Committed by GitHub
Browse files

feat: added new functionality for getting terms from db (#1212) 



* feat: added new functionality for getting terms from db

* fix: terms of use on carrier and merchant working

* fix: added terms to shopmobile

* fix: deepscan issues

Co-authored-by: default avatarRuslan Konviser <evereq@gmail.com>
parent faa505d3

packages/carrier-mobile-ionic/package.json

+1 −1
Original line number Diff line number Diff line 
{

	"name": "@ever-platform/carrier-mobile-ionic",

	"version": "0.3.4",

	"version": "0.3.9",

	"description": "Ever Carrier Mobile App",

	"license": "GPL-3.0",

	"homepage": "https://ever.co/",

packages/carrier-mobile-ionic/src/pages/information/terms-of-use/terms-of-use.ts

+12 −13
Original line number Diff line number Diff line 
import { Component } from '@angular/core';

import { Component, OnInit } from '@angular/core';



import { UserRouter } from '@modules/client.common.angular2/routers/user-router.service';

import { Store } from 'services/store.service';



@Component({

	selector: 'page-terms-of-use',

	templateUrl: 'terms-of-use.html',

	styleUrls: ['terms-of-use.scss'],

})

export class TermsOfUsePage {

export class TermsOfUsePage implements OnInit {

	public useTermsHtml: string = '<h1>Loading...</h1>';

	public selectedLanguage: string;



	constructor(private userRouter: UserRouter, private store: Store) {}



	ionViewWillEnter() {

		this.userRouter.getTermsOfUse(this._userId, this._deviceId).subscribe(

			(innerHtml) => {

				this.useTermsHtml = innerHtml;

			},

			(err) => {

				console.log(err);

	constructor(private userRouter: UserRouter) {

		this.selectedLanguage = localStorage.getItem('_language');

	}

		);



	ngOnInit() {

		this.userRouter

			.getTermsOfUseByLanguage(this.selectedLanguage)

			.subscribe((html) => {

				this.useTermsHtml = html;

			});

	}



	private get _userId() {

packages/common-angular/src/routers/user-router.service.ts

+7 −0
Original line number Diff line number Diff line
@@ -76,6 +76,13 @@ export class UserRouter implements IUserRouter { 
		);

	}



	getTermsOfUseByLanguage(selectedLanguage: string): Observable<string> {

		return this.router.runAndObserve<string>(

			'getTermsOfUseByLanguage',

			selectedLanguage

		);

	}



	getPrivacy(userId: string, deviceId: string): Observable<string> {

		return this.router.runAndObserve<string>(

			'getPrivacy',

packages/core/package.json

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
	"name": "@ever-platform/core",

	"description": "Ever Platform Headless Framework",

	"license": "AGPL-3.0",

	"version": "0.3.9",

	"version": "0.3.12",

	"homepage": "https://ever.co",

	"repository": {

		"type": "git",

packages/core/src/services/users/UsersService.ts

+5 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ export class UsersService extends DBService<User> 
		protected _storesService: WarehousesService

	) {

		super();



		// TODO: too many hardcoded constants used below. Refactor!

		this.watchedFiles = _.zipObject(

			['aboutUs', 'privacy', 'termsOfUse'],
@@ -95,7 +94,7 @@ export class UsersService extends DBService<User> 
					['en-US', 'he-IL', 'ru-RU', 'bg-BG'],

					_.map(['en-US', 'he-IL', 'ru-RU', 'bg-BG'], (language) =>

						observeFile(

							`${__dirname}/../../../res/templates/${folder}/${language}.hbs`

							`${__dirname}/../../../../res/templates/${folder}/${language}.hbs`

						).pipe(

							tap({ error: (err) => this.log.error(err) }),

							publishReplay(1),
@@ -395,6 +394,10 @@ export class UsersService extends DBService<User> 
			switchMap((device) => this.watchedFiles.termsOfUse[device.language])

		);

	}

	@observableListener()

	getTermsOfUseByLanguage(selectedLanguage: string): Observable<string> {

		return this.watchedFiles.termsOfUse[selectedLanguage];

	}



	/**

	 * Get Privacy Policy Content (HTML)