diff options
author | 2019-04-16 11:48:36 +0200 | |
---|---|---|
committer | 2019-04-16 11:48:36 +0200 | |
commit | 82195efa887767443bb514edad6d04a6f1a6b62e (patch) | |
tree | 8a49a5e84333fab64dee113da0608e45fdb7ddc1 /src/stores | |
parent | increase app opens to show share franz overlay (diff) | |
parent | Merge branch 'develop' into chore/streamline-dashboard (diff) | |
download | ferdium-app-82195efa887767443bb514edad6d04a6f1a6b62e.tar.gz ferdium-app-82195efa887767443bb514edad6d04a6f1a6b62e.tar.zst ferdium-app-82195efa887767443bb514edad6d04a6f1a6b62e.zip |
Merge pull request #1393 from meetfranz/chore/streamline-dashboard
Feature/User Websocket
Diffstat (limited to 'src/stores')
-rw-r--r-- | src/stores/FeaturesStore.js | 2 | ||||
-rw-r--r-- | src/stores/PaymentStore.js | 17 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index dcda021c1..e7832088b 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js | |||
@@ -15,6 +15,7 @@ import basicAuth from '../features/basicAuth'; | |||
15 | import workspaces from '../features/workspaces'; | 15 | import workspaces from '../features/workspaces'; |
16 | import shareFranz from '../features/shareFranz'; | 16 | import shareFranz from '../features/shareFranz'; |
17 | import announcements from '../features/announcements'; | 17 | import announcements from '../features/announcements'; |
18 | import settingsWS from '../features/settingsWS'; | ||
18 | 19 | ||
19 | import { DEFAULT_FEATURES_CONFIG } from '../config'; | 20 | import { DEFAULT_FEATURES_CONFIG } from '../config'; |
20 | 21 | ||
@@ -73,5 +74,6 @@ export default class FeaturesStore extends Store { | |||
73 | workspaces(this.stores, this.actions); | 74 | workspaces(this.stores, this.actions); |
74 | shareFranz(this.stores, this.actions); | 75 | shareFranz(this.stores, this.actions); |
75 | announcements(this.stores, this.actions); | 76 | announcements(this.stores, this.actions); |
77 | settingsWS(this.stores, this.actions); | ||
76 | } | 78 | } |
77 | } | 79 | } |
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js index 4cabee194..d4de476c8 100644 --- a/src/stores/PaymentStore.js +++ b/src/stores/PaymentStore.js | |||
@@ -10,15 +10,10 @@ export default class PaymentStore extends Store { | |||
10 | 10 | ||
11 | @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage'); | 11 | @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage'); |
12 | 12 | ||
13 | @observable createDashboardUrlRequest = new Request(this.api.payment, 'getDashboardUrl'); | ||
14 | |||
15 | @observable ordersDataRequest = new CachedRequest(this.api.payment, 'getOrders'); | ||
16 | |||
17 | constructor(...args) { | 13 | constructor(...args) { |
18 | super(...args); | 14 | super(...args); |
19 | 15 | ||
20 | this.actions.payment.createHostedPage.listen(this._createHostedPage.bind(this)); | 16 | this.actions.payment.createHostedPage.listen(this._createHostedPage.bind(this)); |
21 | this.actions.payment.createDashboardUrl.listen(this._createDashboardUrl.bind(this)); | ||
22 | } | 17 | } |
23 | 18 | ||
24 | @computed get plan() { | 19 | @computed get plan() { |
@@ -28,10 +23,6 @@ export default class PaymentStore extends Store { | |||
28 | return this.plansRequest.execute().result || {}; | 23 | return this.plansRequest.execute().result || {}; |
29 | } | 24 | } |
30 | 25 | ||
31 | @computed get orders() { | ||
32 | return this.ordersDataRequest.execute().result || []; | ||
33 | } | ||
34 | |||
35 | @action _createHostedPage({ planId }) { | 26 | @action _createHostedPage({ planId }) { |
36 | const request = this.createHostedPageRequest.execute(planId); | 27 | const request = this.createHostedPageRequest.execute(planId); |
37 | 28 | ||
@@ -39,12 +30,4 @@ export default class PaymentStore extends Store { | |||
39 | 30 | ||
40 | return request; | 31 | return request; |
41 | } | 32 | } |
42 | |||
43 | @action _createDashboardUrl() { | ||
44 | const request = this.createDashboardUrlRequest.execute(); | ||
45 | |||
46 | gaEvent('Payment', 'createDashboardUrl'); | ||
47 | |||
48 | return request; | ||
49 | } | ||
50 | } | 33 | } |