Skip to content

feat: add intial mechanism for billing options(admin) #3152

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
Merged
merged 6 commits into from
Jul 23, 2019
Merged

feat: add intial mechanism for billing options(admin) #3152

merged 6 commits into from
Jul 23, 2019

Conversation

@mrsaicharan1
Copy link
Member

@mrsaicharan1 mrsaicharan1 commented Jun 17, 2019 •
edited
Loading

Screenshot 2019-06-17 at 4 00 59 PM

Added initial billing info subtab in admin

Added Invoice Contact info and Billing sub tab

Fixes #3126
Server PR: fossasia/open-event-server#6130

Short description of what this resolves:

Adds the front end part for configuring invoice settings such as date of invoice sent, timezone and invoice contact.
Will be adding the invoice structure options in a follow-up PR.

Checklist

  • I have read the Contribution & Best practices Guide.
  • My branch is up-to-date with the Upstream development branch.
  • The acceptance, integration, unit tests and linter pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

@mrsaicharan1 mrsaicharan1 changed the title [WIP]feat: add intial mechanism for billing options(admin) feat: add intial mechanism for billing options(admin) Jun 17, 2019
@auto-label auto-label bot added the feature label Jun 17, 2019
@mrsaicharan1 mrsaicharan1 force-pushed the billing-subtab branch 2 times, most recently from 03d9f38 to 401862c Compare June 17, 2019 11:15
@mariobehling
Copy link
Member

@mrsaicharan1 Please always provide screenshots. Travis is failing currently.

@auto-label auto-label bot added the feature label Jun 17, 2019
@mrsaicharan1
Copy link
Member Author

@mariobehling I've put up the screenshot.

@mrsaicharan1 mrsaicharan1 changed the title feat: add intial mechanism for billing options(admin) [WIP]feat: add intial mechanism for billing options(admin) Jun 17, 2019
@auto-label auto-label bot removed the feature label Jun 17, 2019
@mariobehling
Copy link
Member

mariobehling commented Jun 17, 2019 •
edited
Loading

@mrsaicharan1

  • Invoice sent out - Dropdown - : First Day of Month, Second Day of Month, Third Day of Month
  • Timezone for sent outs: [Timezone here]
  • Invoice Format [Format Options here] (please resarch how to do it)

It should be like that in the UI:
Invoice Time to Sent Out: [ Dropdown here]
Timezone for Sent Outs: [ Dropdown here]
Invoice Format: [Edit Field here] * [help text here about what options are possible in the invoice format, e.g. date, year, number, text..]

@mrsaicharan1
Copy link
Member Author

mrsaicharan1 commented Jun 17, 2019 •
edited
Loading

@mrsaicharan1

  • Invoice sent out - Dropdown - : First Day of Month, Second Day of Month, Third Day of Month
  • Timezone for sent outs: [Timezone here]
  • Invoice Format [Format Options here] (please resarch how to do it)

It should be like that in the UI:
Invoice Time to Sent Out: [ Dropdown here]
Timezone for Sent Outs: [ Dropdown here]
Invoice Format: [Edit Field here] * [help text here about what options are possible in the invoice format, e.g. date, year, number, text..]

@mariobehling Yeah, got it. Storing different invoice formats and providing options for it, I was thinking about dealing it in a follow up PR as it would become really confusing to add everything in one PR. Is that okay?

@mariobehling
Copy link
Member

Yes, you can deal with things step by step, but follow the structure and design, please. Thanks.

@mrsaicharan1 mrsaicharan1 force-pushed the billing-subtab branch 7 times, most recently from 74ac6db to ade89eb Compare June 19, 2019 01:18
@mrsaicharan1 mrsaicharan1 changed the title [WIP]feat: add intial mechanism for billing options(admin) feat: add intial mechanism for billing options(admin) Jun 19, 2019
@auto-label auto-label bot added the feature label Jun 19, 2019
@mrsaicharan1 mrsaicharan1 force-pushed the billing-subtab branch 2 times, most recently from fe0406c to d4a54b7 Compare June 19, 2019 01:45
Anupam-dagar
Anupam-dagar previously approved these changes Jun 19, 2019
View reviewed changes
@mrsaicharan1
Copy link
Member Author

I'll shift the admin invoice fields to the settings model/schema so that is more accessible as there exists only one record.

@mrsaicharan1 mrsaicharan1 requested a review from niranjan94 July 12, 2019 10:41
kushthedude
kushthedude suggested changes Jul 13, 2019
View reviewed changes
Copy link
Member

@kushthedude kushthedude left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrsaicharan1 Please take a look at them.

@mrsaicharan1
add intial mechanism for billing options(admin)
858a334 
Added fields for admin invoice contact

Changed model names according to server

added values for each field

Used ES6 syntax

Used attrs to access action closure

Fixed additional info field

remove redundant variable
kushthedude
kushthedude reviewed Jul 13, 2019
View reviewed changes
@mrsaicharan1 mrsaicharan1 force-pushed the billing-subtab branch 2 times, most recently from 12fe36e to 4eeeb78 Compare July 14, 2019 02:02
@mrsaicharan1 mrsaicharan1 requested a review from kushthedude July 14, 2019 02:10
kushthedude
kushthedude previously approved these changes Jul 14, 2019
View reviewed changes
niranjan94
niranjan94 previously approved these changes Jul 14, 2019
View reviewed changes
Copy link
Member

@niranjan94 niranjan94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks okay to me. @CosmicCoder96 please review

@mrsaicharan1 mrsaicharan1 dismissed stale reviews from niranjan94 and kushthedude via 8d3543a July 15, 2019 02:35
@mrsaicharan1
Copy link
Member Author

@niranjan94 @kushthedude @uds5501 @shreyanshdwivedi There were some linting errors. Fixed them.

@fossasia fossasia deleted a comment from kushthedude Jul 18, 2019
@mrsaicharan1
Copy link
Member Author

@CosmicCoder96 I think that we can merge this.

@fossasia fossasia deleted a comment Jul 23, 2019
@abhinavk96 abhinavk96 merged commit 2e6625a into fossasia:development Jul 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

7 more reviewers

@Anupam-dagar Anupam-dagar Anupam-dagar left review comments

@abhinavk96 abhinavk96 abhinavk96 approved these changes

@uds5501 uds5501 uds5501 approved these changes

@shreyanshdwivedi shreyanshdwivedi shreyanshdwivedi approved these changes

@prateekj117 prateekj117 prateekj117 approved these changes

@kushthedude kushthedude kushthedude approved these changes

@niranjan94 niranjan94 niranjan94 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

feature

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Admin: Add "Billing" Subtab in Admin Settings

9 participants

@mrsaicharan1 @mariobehling @abhinavk96 @niranjan94 @uds5501 @Anupam-dagar @shreyanshdwivedi @prateekj117 @kushthedude