Commit 24b34092 authored by RAHUL RATHORE's avatar RAHUL RATHORE
Browse files

fix: build issue for "shop-mobile-ionic"

parent 2cab6739

packages/merchant-tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.html

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
	</button>

	<form-wizard #wizzardFrom [ngClass]="{ 'second-step': choicedNew }">

		<wizard-step

			#wizzardFromStep1

			[isValid]="choiced"

			#wizardFromStep1

			[isValid]="choicedNew"

			[title]="wizardStepsTitle.step1"

		>

			<add-choice #addChoice (click)="onStep1Next(choiced)"></add-choice>

packages/merchant-tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts

+8 −8
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ export class AddCarriersPopupPage implements OnInit, OnDestroy { 
	@ViewChild('addChoice', { static: true })

	addChoiceComponent: AddChoiceComponent;



	@ViewChild('wizzardFrom', { static: true })

	wizzardFrom: any;

	@ViewChild('wizardFrom', { static: true })

	wizardFrom: any;



	@ViewChild('wizzardFromStep1', { static: true })

	wizzardFromStep1: any;

	@ViewChild('wizardFromStep1', { static: true })

	wizardFromStep1: any;



	@ViewChild('wizardFormStep2', { static: true })

	wizardFormStep2: any;
@@ -53,11 +53,11 @@ export class AddCarriersPopupPage implements OnInit, OnDestroy { 
	) {}



	ngOnInit() {

		this.wizzardFromStep1.showNext = false;

		this.wizardFromStep1.showNext = false;



		this.choice$ = this.addChoiceComponent.choice.subscribe(async (res) => {

			this.choiced = res;

			this.wizzardFrom.next();

			this.wizardFrom.next();

		});

	}
@@ -65,14 +65,14 @@ export class AddCarriersPopupPage implements OnInit, OnDestroy { 
		const prevOrdNext: string = data;



		if (prevOrdNext === 'previous') {

			this.wizzardFrom.previous();

			this.wizardFrom.previous();

			this.choicedNew = false;

		}

	}



	completeCreateCarrier(data) {

		if (data === 'complete') {

			this.wizzardFrom.complete();

			this.wizardFrom.complete();

		}

	}

packages/shop-mobile-ionic/package.json

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
		"@ionic/angular": "^5.8.4",

		"@ionic/pro": "^2.0.4",

		"@ionic/storage": "^3.0.6",

		"ngx-progressbar": "^6.1.1",

		"@ionic/storage-angular": "^3.0.6",

		"@ngx-translate/core": "^13.0.0",

		"@ngx-translate/http-loader": "^6.0.0",

		"apollo-angular": "^2.6.0",
@@ -126,6 +126,7 @@ 
		"lodash.mergewith": "^4.6.2",

		"mx.ferreyra.callnumber": "0.0.2",

		"neo-async": "^2.6.2",

		"ngx-progressbar": "^6.1.1",

		"phonegap-plugin-barcodescanner": "^8.0.1",

		"pm2": "^5.1.2",

		"qrcode": "^1.4.4",

packages/shop-mobile-ionic/src/app/app.module.ts

+7 −9
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ import { AppRoutingModule } from './app-routing.module'; 
import { AppComponent } from './app.component';

// import { Logger } from 'angular2-logger/core';

import { environment } from 'environments/environment';

import { HttpLink, HttpLinkModule } from 'apollo-angular-link-http';

import { HttpLink, HttpLinkHandler } from 'apollo-angular/http';

import { Apollo } from 'apollo-angular';

import { InMemoryCache } from '@apollo/client/core';

import { WebSocketLink } from 'apollo-link-ws';

import { setContext } from 'apollo-link-context';

import { ApolloLink } from 'apollo-link';

import { WebSocketLink } from '@apollo/client/link/ws';

import { setContext } from '@apollo/client/link/context';

import { ApolloLink, InMemoryCache } from '@apollo/client/core';

import { getOperationAST } from 'graphql';

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

import { ServerSettings } from './services/server-settings';
@@ -44,7 +43,6 @@ import { CallPageModule } from './pages/+products/+order/+call/call.module'; 
		BrowserAnimationsModule,

		MenuModule,

		CallPageModule,

		HttpLinkModule,

		IonicModule.forRoot(),

		IonicStorageModule.forRoot(),

		TranslateModule.forRoot({
@@ -114,12 +112,12 @@ export class AppModule { 


	private _setupApolloAngular() {

		// Create an http link

		const http = this.httpLink.create({

		const http: HttpLinkHandler = this.httpLink.create({

			uri: environment.GQL_ENDPOINT,

		});



		// Create a WebSocket link

		const ws = new WebSocketLink({

		const ws: WebSocketLink = new WebSocketLink({

			uri: environment.GQL_SUBSCRIPTIONS_ENDPOINT,

			options: {

				reconnect: true,
@@ -127,7 +125,7 @@ export class AppModule { 
			},

		});



		const authLink = setContext((_, { headers }) => {

		const authLink: ApolloLink = setContext((_, { headers }) => {

			// get the authentication token from local storage if it exists

			const token = this.store.token;

			// return the headers to the context so httpLink can read them

packages/shop-mobile-ionic/src/app/pages/+products/+order/common/payment/payment.component.ts

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import { Component, Input, EventEmitter } from '@angular/core'; 
import Order from '@modules/server.common/entities/Order';

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

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

import Stripe from 'stripe';

import { Stripe } from 'stripe';

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

import { environment } from 'environments/environment';

import { ModalController } from '@ionic/angular';
@@ -23,7 +23,7 @@ export class PaymentComponent { 
	@Input()

	smallButtons: boolean;



	userCard: Stripe.cards.ICard | null = null;

	userCard: Stripe.Card | null = null;



	private stripePublishableKey: string = environment.STRIPE_PUBLISHABLE_KEY;