fix: Added quantity, min/max price validations & fixed donations bugs #3209

mrsaicharan1 · 2019-06-27T19:40:55Z

Fixes #3184

When organizer tries to add tickets worth of 0 value

Min max validation checks

When the ticket buyer tries to add zero valued donation tickets

Short description of what this resolves:

Does not allow donation tickets worth of 0 value to be purchased & adds quantity support

Changes proposed in this pull request:

Added quantity support for donation tickets
Removed duplicate code segment to prevent price repitition
Added check to allow donations to be limited to a pre-specified price range (minPrice and maxPrice)
Fixed the price update bug by adding price to watchable properties

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)

app/components/forms/wizard/basic-details-step.js

kushthedude

@mrsaicharan1 Please do the following else looks good

app/components/public/ticket-list.js

app/components/forms/wizard/basic-details-step.js

kushthedude · 2019-06-28T16:53:30Z

Yeah I had this question. We could have an icon popup specifying it.

Whatever looks well can be done 👍

mrsaicharan1 · 2019-06-29T02:53:49Z

@niranjan94 @CosmicCoder96 There was a bug related to the donation price. The subtotal was getting updated but the total wasn't as the price of the donation is variable. I fixed that by adding the ticket price to the watchable property

kushthedude

@mrsaicharan1 Please have a look here, Else is fine.

Try to inculcate Total in one line if possible :

app/components/forms/wizard/basic-details-step.js

mrsaicharan1 · 2019-07-01T07:05:56Z

I’ve written 2 validation rules checkMax and checkMin as multiple paramters are not supported by validation rules.
Reference:Semantic-Org/Semantic-UI#3682 (comment)

It’s getting validated but it always returns false. Always prompts Ticket max price should be greater than min price

app/components/forms/wizard/basic-details-step.js

app/templates/components/public/ticket-list.hbs

mrsaicharan1 · 2019-07-02T03:38:56Z

@niranjan94 @CosmicCoder96 I had already written a validation check for min/max price on the server. I feel that the FE validation isn't required as Max/min tickets per order also follows the same practice. Please have a look here...

https://github.com/fossasia/open-event-server/blob/e3c20af06e4034217d914984eac0332d08239fc3/app/api/schema/tickets.py#L60

app/components/widgets/forms/ticket-input.js

app/templates/components/widgets/forms/ticket-input.hbs

mrsaicharan1 · 2019-07-07T03:55:50Z

@niranjan94 I've made the requested changes. Used gte from the ember API for comparison & removed major validation logic in the template

niranjan94 · 2019-07-07T04:16:41Z

app/components/public/ticket-list.js

+  donationTicketsValidation: computed('donationTickets.@each.id', 'donationTickets.@each.minPrice', 'donationTickets.@each.maxPrice', function() {
+    let validationRules = {};
+    this.donationTickets.forEach(donationTicket => {
+      validationRules = merge(validationRules, {


Merge is not required for this. You're just creating a new object any way. You can just directly assign stuff with validationRules[donationTicket.id] =

@niranjan94 Yeah, I guess you're right. Removed the redudant merge.

niranjan94 · 2019-07-07T04:16:55Z

app/components/public/ticket-list.js

@@ -176,14 +200,32 @@ export default Component.extend(FormMixin, {
      this.send('togglePromotionalCode', this.code);
    }
  },
+  donationTicketsValidation: computed('donationTickets.@each.id', 'donationTickets.@each.minPrice', 'donationTickets.@each.maxPrice', function() {
+    let validationRules = {};
+    this.donationTickets.forEach(donationTicket => {


Use for-of loop

@niranjan94 Done.

niranjan94 · 2019-07-08T06:19:32Z

app/components/public/ticket-list.js

+  donationTickets: computed.filterBy('data', 'type', 'donation'),
+
+  isDonationPriceValid: computed('donationTickets.@each.orderQuantity', 'donationTickets.@each.price', function() {
+    let returnValue = false;


Can be simplified into

for (const ticket of this.donationTickets) { if (donationTicket.orderQuantity > 0) { if (donationTicket.price < donationTicket.minPrice || donationTicket.price > donationTicket.maxPrice) { return false } } } return true

@niranjan94 Done.

app/components/public/ticket-list.js

Added watched properties and fixed totalling error Added semantic validation Added dynamic popup for ticket buyers Added action to check for max/min price Added quantitiy, min-max and bug fixes for donations removed repeated code Add error class validation Fixed paid & free tickets bug ESLint Used for-of & removed redundant merge Optimized donationsValidation property

auto-label bot added the fix label Jun 27, 2019

mrsaicharan1 changed the title ~~fix: Added quantity and min/max price validations for donations~~ [WIP]fix: Added quantity and min/max price validations for donations Jun 27, 2019

auto-label bot removed the fix label Jun 27, 2019

mrsaicharan1 force-pushed the donations-fix branch from 6e43fcc to 4bdc17b Compare June 27, 2019 19:59

mrsaicharan1 changed the title ~~[WIP]fix: Added quantity and min/max price validations for donations~~ fix: Added quantity and min/max price validations for donations Jun 27, 2019

auto-label bot added the fix label Jun 27, 2019

niranjan94 suggested changes Jun 28, 2019

View reviewed changes

app/components/forms/wizard/basic-details-step.js Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the donations-fix branch 3 times, most recently from 10fefce to abe4651 Compare June 28, 2019 11:19

kushthedude suggested changes Jun 28, 2019

View reviewed changes

app/components/public/ticket-list.js Outdated Show resolved Hide resolved

app/components/forms/wizard/basic-details-step.js Outdated Show resolved Hide resolved

niranjan94 suggested changes Jun 28, 2019

View reviewed changes

app/components/forms/wizard/basic-details-step.js Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the donations-fix branch 3 times, most recently from 794bde1 to f7ec5d5 Compare June 29, 2019 02:51

kushthedude suggested changes Jun 29, 2019

View reviewed changes

app/components/forms/wizard/basic-details-step.js Outdated Show resolved Hide resolved

app/components/forms/wizard/basic-details-step.js Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the donations-fix branch 2 times, most recently from 656563f to 55876d4 Compare June 30, 2019 05:06

niranjan94 suggested changes Jun 30, 2019

View reviewed changes

app/components/forms/wizard/basic-details-step.js Outdated Show resolved Hide resolved

mrsaicharan1 changed the title ~~fix: Added quantity and min/max price validations for donations~~ [WIP]fix: Added quantity and min/max price validations for donations Jul 1, 2019

auto-label bot removed the fix label Jul 1, 2019

mrsaicharan1 commented Jul 1, 2019

View reviewed changes

app/components/forms/wizard/basic-details-step.js Outdated Show resolved Hide resolved

kushthedude suggested changes Jul 1, 2019

View reviewed changes

app/templates/components/public/ticket-list.hbs Outdated Show resolved Hide resolved

mrsaicharan1 changed the title ~~[WIP]fix: Added quantity and min/max price validations for donations~~ fix: Added quantity and min/max price validations for donations Jul 2, 2019

auto-label bot added the fix label Jul 2, 2019

fossasia deleted a comment from kushthedude Jul 2, 2019

niranjan94 suggested changes Jul 4, 2019

View reviewed changes

app/components/widgets/forms/ticket-input.js Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the donations-fix branch 6 times, most recently from 6737ac4 to 566bf03 Compare July 4, 2019 22:19

mrsaicharan1 commented Jul 5, 2019

View reviewed changes

app/templates/components/widgets/forms/ticket-input.hbs Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the donations-fix branch from 566bf03 to 5d5a5b4 Compare July 5, 2019 05:06

mrsaicharan1 changed the title ~~fix: Added quantity and min/max price validations for donations~~ fix: Added quantity, min/max price validations & fixed donations bugs Jul 6, 2019

mrsaicharan1 requested a review from niranjan94 July 8, 2019 03:23

niranjan94 suggested changes Jul 8, 2019

View reviewed changes

mrsaicharan1 force-pushed the donations-fix branch 4 times, most recently from 722bcf1 to 58f0a63 Compare July 8, 2019 03:42

niranjan94 suggested changes Jul 8, 2019

View reviewed changes

mrsaicharan1 force-pushed the donations-fix branch from ac5de5f to 1f6c5dd Compare July 8, 2019 06:29

mrsaicharan1 requested a review from niranjan94 July 8, 2019 15:13

niranjan94 approved these changes Jul 9, 2019

View reviewed changes

niranjan94 requested a review from abhinavk96 July 9, 2019 06:41

Merge branch 'development' into donations-fix

15364b4

kushthedude approved these changes Jul 9, 2019

View reviewed changes

mrsaicharan1 requested a review from shreyanshdwivedi July 10, 2019 15:35

abhinavk96 approved these changes Jul 10, 2019

View reviewed changes

uds5501 approved these changes Jul 10, 2019

View reviewed changes

kushthedude approved these changes Jul 10, 2019

View reviewed changes

kushthedude merged commit daa6a85 into fossasia:development Jul 10, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Added quantity, min/max price validations & fixed donations bugs #3209

fix: Added quantity, min/max price validations & fixed donations bugs #3209

mrsaicharan1 commented Jun 27, 2019 •

edited

Loading

kushthedude left a comment

kushthedude commented Jun 28, 2019

mrsaicharan1 commented Jun 29, 2019 •

edited

Loading

kushthedude left a comment

mrsaicharan1 commented Jul 1, 2019

mrsaicharan1 commented Jul 2, 2019 •

edited

Loading

mrsaicharan1 commented Jul 7, 2019

niranjan94 Jul 7, 2019

mrsaicharan1 Jul 8, 2019

niranjan94 Jul 7, 2019

mrsaicharan1 Jul 8, 2019

niranjan94 Jul 8, 2019

mrsaicharan1 Jul 8, 2019

fix: Added quantity, min/max price validations & fixed donations bugs #3209

fix: Added quantity, min/max price validations & fixed donations bugs #3209

Conversation

mrsaicharan1 commented Jun 27, 2019 • edited Loading

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

kushthedude left a comment

Choose a reason for hiding this comment

kushthedude commented Jun 28, 2019

mrsaicharan1 commented Jun 29, 2019 • edited Loading

kushthedude left a comment

Choose a reason for hiding this comment

mrsaicharan1 commented Jul 1, 2019

mrsaicharan1 commented Jul 2, 2019 • edited Loading

mrsaicharan1 commented Jul 7, 2019

niranjan94 Jul 7, 2019

Choose a reason for hiding this comment

mrsaicharan1 Jul 8, 2019

Choose a reason for hiding this comment

niranjan94 Jul 7, 2019

Choose a reason for hiding this comment

mrsaicharan1 Jul 8, 2019

Choose a reason for hiding this comment

niranjan94 Jul 8, 2019

Choose a reason for hiding this comment

mrsaicharan1 Jul 8, 2019

Choose a reason for hiding this comment

mrsaicharan1 commented Jun 27, 2019 •

edited

Loading

mrsaicharan1 commented Jun 29, 2019 •

edited

Loading

mrsaicharan1 commented Jul 2, 2019 •

edited

Loading