From 6a6066e1b448fa0b0bdb9b86d4ef31c32f5f8c8c Mon Sep 17 00:00:00 2001 From: maze-runner Date: Mon, 26 Jul 2021 20:45:45 +0530 Subject: [PATCH 1/4] adding frontend ans server version on admin page --- app/controllers/admin/index.js | 23 +++++++++++++++++++++++ app/templates/admin/index.hbs | 18 ++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 app/controllers/admin/index.js diff --git a/app/controllers/admin/index.js b/app/controllers/admin/index.js new file mode 100644 index 00000000000..3765ae413db --- /dev/null +++ b/app/controllers/admin/index.js @@ -0,0 +1,23 @@ +import classic from 'ember-classic-decorator'; +import { action } from '@ember/object'; +import Controller from '@ember/controller'; +import { tracked } from '@glimmer/tracking'; + +@classic +export default class IndexController extends Controller { + +@tracked +frontendVersion = ''; + +@tracked +serverVersion = ''; + +@action +async setup() { +const fVersion = await this.loader.load('https://api.github.com/repos/fossasia/open-event-frontend/git/refs/heads/development', { isExternal: true }); +this.frontendVersion = fVersion.object?.sha; +const bVersion = await this.loader.load('https://api.github.com/repos/fossasia/open-event-server/git/refs/heads/development', { isExternal: true }); +this.serverVersion = bVersion.object?.sha; +} +} + diff --git a/app/templates/admin/index.hbs b/app/templates/admin/index.hbs index 80d182d8ce1..22ab61ef653 100644 --- a/app/templates/admin/index.hbs +++ b/app/templates/admin/index.hbs @@ -1,11 +1,4 @@ -
-
-
-
- {{t 'Version 1.0.0-alpha.10'}} -
-
-
+
@@ -214,4 +207,13 @@
+
+
+
+ {{t 'Frontend Version: '}}{{this.frontendVersion}}
+ {{t 'Server Version: '}}{{this.serverVersion}} +
+
+
+
From e62e06c4c6798c30fd953086735523586330761d Mon Sep 17 00:00:00 2001 From: maze-runner Date: Mon, 26 Jul 2021 20:48:03 +0530 Subject: [PATCH 2/4] f --- app/controllers/admin/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/index.js b/app/controllers/admin/index.js index 3765ae413db..59f17061dda 100644 --- a/app/controllers/admin/index.js +++ b/app/controllers/admin/index.js @@ -14,10 +14,10 @@ serverVersion = ''; @action async setup() { -const fVersion = await this.loader.load('https://api.github.com/repos/fossasia/open-event-frontend/git/refs/heads/development', { isExternal: true }); -this.frontendVersion = fVersion.object?.sha; -const bVersion = await this.loader.load('https://api.github.com/repos/fossasia/open-event-server/git/refs/heads/development', { isExternal: true }); -this.serverVersion = bVersion.object?.sha; + const fVersion = await this.loader.load('https://api.github.com/repos/fossasia/open-event-frontend/git/refs/heads/development', { isExternal: true }); + this.frontendVersion = fVersion.object?.sha; + const bVersion = await this.loader.load('https://api.github.com/repos/fossasia/open-event-server/git/refs/heads/development', { isExternal: true }); + this.serverVersion = bVersion.object?.sha; } } From d6a481af7c568fa0bfa63c579c548d350b086fd3 Mon Sep 17 00:00:00 2001 From: maze-runner Date: Mon, 26 Jul 2021 20:52:50 +0530 Subject: [PATCH 3/4] revert --- app/controllers/admin/index.js | 23 ----------------------- app/templates/admin/index.hbs | 18 ++++++++---------- 2 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 app/controllers/admin/index.js diff --git a/app/controllers/admin/index.js b/app/controllers/admin/index.js deleted file mode 100644 index 59f17061dda..00000000000 --- a/app/controllers/admin/index.js +++ /dev/null @@ -1,23 +0,0 @@ -import classic from 'ember-classic-decorator'; -import { action } from '@ember/object'; -import Controller from '@ember/controller'; -import { tracked } from '@glimmer/tracking'; - -@classic -export default class IndexController extends Controller { - -@tracked -frontendVersion = ''; - -@tracked -serverVersion = ''; - -@action -async setup() { - const fVersion = await this.loader.load('https://api.github.com/repos/fossasia/open-event-frontend/git/refs/heads/development', { isExternal: true }); - this.frontendVersion = fVersion.object?.sha; - const bVersion = await this.loader.load('https://api.github.com/repos/fossasia/open-event-server/git/refs/heads/development', { isExternal: true }); - this.serverVersion = bVersion.object?.sha; -} -} - diff --git a/app/templates/admin/index.hbs b/app/templates/admin/index.hbs index 22ab61ef653..80d182d8ce1 100644 --- a/app/templates/admin/index.hbs +++ b/app/templates/admin/index.hbs @@ -1,4 +1,11 @@ -
+
+
+
+
+ {{t 'Version 1.0.0-alpha.10'}} +
+
+
@@ -207,13 +214,4 @@
-
-
-
- {{t 'Frontend Version: '}}{{this.frontendVersion}}
- {{t 'Server Version: '}}{{this.serverVersion}} -
-
-
-
From d53fff35972a7b1a72158c978dbd32095cc5e6a6 Mon Sep 17 00:00:00 2001 From: maze-runner Date: Sun, 8 Aug 2021 10:49:51 +0530 Subject: [PATCH 4/4] add payment currency --- app/templates/components/modals/paytm-otp.hbs | 2 +- app/templates/components/modals/paytm-payment-options.hbs | 2 +- .../cell/events/view/tickets/discount-codes/cell-value.hbs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/components/modals/paytm-otp.hbs b/app/templates/components/modals/paytm-otp.hbs index 712a9db7a5e..23625bbf672 100644 --- a/app/templates/components/modals/paytm-otp.hbs +++ b/app/templates/components/modals/paytm-otp.hbs @@ -1,5 +1,5 @@
- {{t 'Amount to be paid:'}} {{currency-symbol this.currency}} {{amount}} + {{t 'Amount to be paid:'}}
diff --git a/app/templates/components/modals/paytm-payment-options.hbs b/app/templates/components/modals/paytm-payment-options.hbs index 46d579676fc..37898c71fc0 100644 --- a/app/templates/components/modals/paytm-payment-options.hbs +++ b/app/templates/components/modals/paytm-payment-options.hbs @@ -1,5 +1,5 @@
- {{t 'Amount to be paid:'}} {{currency-symbol this.currency}} {{amount}} + {{t 'Amount to be paid:'}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs index 90cc66246f4..a6ec4941bdf 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs @@ -2,6 +2,6 @@ {{#if (eq this.extraRecords.type 'percent')}} {{this.record}} % {{else if (eq this.extraRecords.type 'amount')}} - {{currency-symbol this.extraRecords.event.paymentCurrency}} {{this.record}} + {{/if}}