Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Beta 1 dev #1262

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Beta 1 dev #1262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b30bd01
Initial bellem setup
lemagnifick Jul 15, 2020
bf0c836
Initial bellem setup
lemagnifick Jul 15, 2020
d54d8e9
Initial bellem setup
lemagnifick Jul 15, 2020
9f75c61
=setup: Initial bellem setup
lemagnifick Jul 15, 2020
f2d4a9c
change ES2015 to ES5
Jul 15, 2020
ff94415
translate to french WAREHOUSES_VIEW.SHOW_ON_MAP
lemagnifick Jul 15, 2020
1f341f6
Hide Orders on sidebar menu
lemagnifick Jul 15, 2020
0fac6ca
=Mobile app Core update
Jul 16, 2020
c566d71
=lang: remove other langs on packages/core/src/services/invites/Invit…
lemagnifick Jul 16, 2020
5e596f0
=lang: fix Ilanguage
lemagnifick Jul 16, 2020
497b2a6
=lang: fix language Core & Admin
lemagnifick Jul 16, 2020
ba9dd55
Merge branch 'beta-1' into beta-1-dev
lemagnifick Jul 17, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
=setup: Initial bellem setup
  • Loading branch information
@lemagnifick
lemagnifick committed Jul 15, 2020
commit 9f75c614d9dde7ca3e1336fb2a8024e5100311c7
7 changes: 7 additions & 0 deletions packages/common-angular/src/routers/user-router.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 0 additions & 2 deletions packages/common/src/routers/IOrderRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ interface IOrderRouter {
options?: IOrderRouterGetOptions
): Observable<Order | null>;

getOrders(options?: IOrderRouterGetOptions): Observable<Order[]>;

confirm(orderId: Order['id']): Promise<Order>;

updateCarrierStatus(
Expand Down