Commit f3ee366c authored by RAHUL RATHORE's avatar RAHUL RATHORE
Browse files

fix: geo location & typo issue

parent 42c672b4

packages/core/src/graphql/geo-locations/merchants/geo-location-merchants.graphql

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

	getCoseMerchants(geoLocation: GeoLocationFindInput!): [Warehouse]!

	getCloseMerchants(geoLocation: GeoLocationFindInput!): [Warehouse]!

}

packages/core/src/graphql/geo-locations/merchants/geo-location-merchants.resolver.ts

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ export class GeoLocationMerchantsResolver { 
		public geoLocationsWarehousesService: GeoLocationsWarehousesService

	) {}



	@Query('getCoseMerchants')

	async getCoseMerchants(_, { geoLocation }: { geoLocation: IGeoLocation }) {

	@Query('getCloseMerchants')

	async getCloseMerchants(_, { geoLocation }: { geoLocation: IGeoLocation }) {

		let merchants = await this.geoLocationsWarehousesService.getMerchants(

			geoLocation,

			IN_STORE_DISTANCE,

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import { combineLatest, of, throwError, Observable } from 'rxjs'; 
@injectable()

@routerName('user-products')

export class UsersProductsService implements IUserProductsRouter, IService {

	private static templatesDirPath: string = `${__dirname}/../../../../res/templates/`;

	private static templatesDirPath: string = `${__dirname}/../../../res/templates/`;



	protected _placeholderTemplateFileName: string =

		UsersProductsService.templatesDirPath + `user_products_placeholder.hbs`;

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

+4 −4
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ const routes: Routes = [ 
	},

];



const config: ExtraOptions = {

	useHash: true,

	enableTracing: true,

};

// const config: ExtraOptions = {

// 	useHash: true,

// 	enableTracing: true,

// };



@NgModule({

	// imports: [RouterModule.forRoot(routes, config)],

packages/shop-mobile-ionic/src/app/components/menu/submenu/submenu.component.html

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
				routerDirection="root"

				routerLinkActive="activated"

			>

				<ion-icon ios="md-basket" md="md-basket"></ion-icon>

				<ion-icon name="basket"></ion-icon>

				<ion-label>{{

					'SIDE_MENU.GROUPS.NO_TITLE.ITEMS.PRODUCTS' | translate

				}}</ion-label>
@@ -52,7 +52,6 @@ 


	<ion-item-group>

		<ion-item-divider>

			<ion-icon name="settings"></ion-icon>

			<ion-label>{{

				'SIDE_MENU.GROUPS.SETTINGS.DIVER_TITLE' | translate

			}}</ion-label>