fix: Discount Codes: Simplify Form #5758

divyamtayal · 2020-11-25T17:39:24Z

Changes proposed in this pull request:

Simplify the discount of events as follows:

Pre-fill "Number of discounted tickets" with "10"
Change "Valid from" to "Discount valid from"
Change "Expires on" to "Discount expires on"
Show time in the same line with dates
Show timezone of the event in the same way as in the wizard
Take out "Show more options" switch and always show below option
Take out "Status" and always make the status active

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)

vercel · 2020-11-25T17:39:30Z

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/eventyay/open-event-frontend/cc3t014w9
✅ Preview: https://open-event-frontend-git-discount-code-5750.eventyay.vercel.app

codecov · 2020-11-25T17:47:14Z

Codecov Report

Merging #5758 (a2c887e) into development (6924ac0) will decrease coverage by 0.04%.
The diff coverage is 0.00%.

@@               Coverage Diff               @@
##           development    #5758      +/-   ##
===============================================
- Coverage        23.45%   23.40%   -0.05%     
===============================================
  Files              512      513       +1     
  Lines             5445     5482      +37     
  Branches            63       62       -1     
===============================================
+ Hits              1277     1283       +6     
- Misses            4152     4183      +31     
  Partials            16       16

Impacted Files	Coverage Δ
app/models/discount-code.js	`0.00% <0.00%> (ø)`
app/utils/computed-helpers.js	`19.56% <0.00%> (-4.58%)`	⬇️
app/models/custom-form.js	`28.57% <0.00%> (-2.20%)`	⬇️
app/models/event.js	`50.00% <0.00%> (ø)`
app/routes/index.js	`78.57% <0.00%> (ø)`
app/models/session.js	`10.00% <0.00%> (ø)`
app/models/speaker.js	`0.00% <0.00%> (ø)`
app/models/social-link.js	`0.00% <0.00%> (ø)`
app/components/widgets/forms/link-input.js	`33.33% <0.00%> (ø)`
app/routes/application.js	`83.78% <0.00%> (+0.45%)`	⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6924ac0...d082e43. Read the comment docs.

This reverts commit ae55d52.

.env.example

This reverts commit 0652049.

divyamtayal · 2020-11-25T18:19:00Z

@iamareebjamal I am not able to see the event timezone on the discount page?

divyamtayal · 2020-11-25T18:40:51Z

NaviRocker

Please Squash your commits.

mariobehling

I checked the UI. It looks good for me. Was not able to test entire functionality yet. Please help with testing that as well.

divyamtayal · 2020-11-25T20:29:01Z

Show timezone of the event in the same way as in the wizard

@mariobehling where to make changes for this?

divyamtayal · 2020-11-25T21:49:51Z

Done #5759

divyamtayal · 2020-11-27T11:03:27Z

@iamareebjamal Pls let me know to make any changes

iamareebjamal · 2020-11-27T13:32:06Z

app/models/discount-code.js

@@ -33,6 +32,9 @@ export default ModelBase.extend({
  isExpired : computed('validTill', function() {
    return new Date() > new Date(this.validTill);
  }),
+  maxQuantity: computed('ticketsNumber', function() {
+    return this.ticketsNumber;


I don't think we need this, because if the ticketsNumber is changed, this won't change. Please make it a large number for now, like 100000, and open an issue on server to handle the maxQuantity being negative, i.e. -1

If it is negative, server should not limit the discount code count

Start

0652049

vercel bot deployed to Preview November 25, 2020 17:39 View deployment

divyamtayal changed the title ~~Start~~ Discount Codes: Simplify Form Nov 25, 2020

Merge branch 'development' into discount-code-5750

21a278a

vercel bot deployed to Preview November 25, 2020 17:40 View deployment

Changes Done

ae55d52

vercel bot deployed to Preview November 25, 2020 17:48 View deployment

Revert "Changes Done"

c3ce9a2

This reverts commit ae55d52.

vercel bot deployed to Preview November 25, 2020 17:56 View deployment

Changes Done

4cee2f6

vercel bot deployed to Preview November 25, 2020 18:10 View deployment

iamareebjamal reviewed Nov 25, 2020

View reviewed changes

.env.example Outdated Show resolved Hide resolved

Revert "Start"

73767c1

This reverts commit 0652049.

vercel bot deployed to Preview November 25, 2020 18:21 View deployment

Date and time inline

7926bd7

vercel bot deployed to Preview November 25, 2020 18:40 View deployment

divyamtayal requested a review from iamareebjamal November 25, 2020 18:42

NaviRocker suggested changes Nov 25, 2020

View reviewed changes

mariobehling previously approved these changes Nov 25, 2020

View reviewed changes

divyamtayal mentioned this pull request Nov 25, 2020

Discount Code: Take out feature "Set min/max quantity to purchase per order" #5759

Closed

daretobedifferent18 added 2 commits November 26, 2020 03:17

Removed min/max tickets per order

fe71571

code cleanup

a2c887e

divyamtayal dismissed mariobehling’s stale review via a2c887e November 25, 2020 21:48

vercel bot deployed to Preview November 25, 2020 21:48 View deployment

divyamtayal requested a review from mariobehling November 25, 2020 23:45

iamareebjamal changed the title ~~Discount Codes: Simplify Form~~ fix: Discount Codes: Simplify Form Nov 27, 2020

auto-label bot added the fix label Nov 27, 2020

iamareebjamal reviewed Nov 27, 2020

View reviewed changes

Made maxQuantity to large no.

f2a6e77

vercel bot deployed to Preview November 27, 2020 19:23 View deployment

Merge branch 'development' into discount-code-5750

d082e43

vercel bot deployed to Preview November 27, 2020 19:26 View deployment

iamareebjamal approved these changes Nov 27, 2020

View reviewed changes

iamareebjamal merged commit d6fc799 into fossasia:development Nov 27, 2020

divyamtayal deleted the discount-code-5750 branch November 27, 2020 20:40

divyamtayal restored the discount-code-5750 branch November 27, 2020 20:40

divyamtayal deleted the discount-code-5750 branch November 27, 2020 20:41

divyamtayal mentioned this pull request Nov 29, 2020

Handle the maxQuantity being negative fossasia/open-event-server#7474

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Discount Codes: Simplify Form #5758

fix: Discount Codes: Simplify Form #5758

divyamtayal commented Nov 25, 2020 •

edited

Loading

vercel bot commented Nov 25, 2020 •

edited

Loading

codecov bot commented Nov 25, 2020 •

edited

Loading

divyamtayal commented Nov 25, 2020

divyamtayal commented Nov 25, 2020

NaviRocker left a comment

mariobehling left a comment

divyamtayal commented Nov 25, 2020

divyamtayal commented Nov 25, 2020

divyamtayal commented Nov 27, 2020

iamareebjamal Nov 27, 2020

fix: Discount Codes: Simplify Form #5758

fix: Discount Codes: Simplify Form #5758

Conversation

divyamtayal commented Nov 25, 2020 • edited Loading

Changes proposed in this pull request:

Checklist

vercel bot commented Nov 25, 2020 • edited Loading

codecov bot commented Nov 25, 2020 • edited Loading

Codecov Report

divyamtayal commented Nov 25, 2020

divyamtayal commented Nov 25, 2020

NaviRocker left a comment

Choose a reason for hiding this comment

mariobehling left a comment

Choose a reason for hiding this comment

divyamtayal commented Nov 25, 2020

divyamtayal commented Nov 25, 2020

divyamtayal commented Nov 27, 2020

iamareebjamal Nov 27, 2020

Choose a reason for hiding this comment

divyamtayal commented Nov 25, 2020 •

edited

Loading

vercel bot commented Nov 25, 2020 •

edited

Loading

codecov bot commented Nov 25, 2020 •

edited

Loading