Added quantity support for donations & fixed bugs

Added watched properties and fixed totalling error

Add min/max validation

Added check for zero

Added semantic validation

Added dynamic popup for ticket buyers

Modified validation rules

Author: mrsaicharan1

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

@@ -121,6 +121,13 @@ export default Component.extend(FormMixin, EventWizardMixin, {
   },
 
   getValidationRules() {
+    window.$.fn.form.settings.rules.checkMaxMin = () => {
+      let returnValue = false;
+      if (this.$('.ui.form').form('get value', 'min_price')[0] < this.$('.ui.form').form('get value', 'max_price')[0]) {
+        returnValue = true;
+      }
+      return returnValue;
+    };
     let validationRules = {
       inline : true,
       delay  : false,
@@ -269,6 +276,40 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             }
           ]
         },
+        ticketMinPrice: {
+          identifier : 'min_price',
+          rules      : [
+            {
+              type   : 'empty',
+              prompt : this.l10n.t('Minimum price for donation tickets required')
+            },
+            {
+              type   : 'integer[1..]',
+              prompt : this.l10n.t('Ticket price needs to be greater than zero')
+            },
+            {
+              type   : 'checkMaxMin',
+              prompt : this.l10n.t('Ticket min price should be lesser than max price')
+            }
+          ]
+        },
+        ticketMaxPrice: {
+          identifier : 'max_price',
+          rules      : [
+            {
+              type   : 'empty',
+              prompt : this.l10n.t('Maximum price for donation tickets required')
+            },
+            {
+              type   : 'integer[1..]',
+              prompt : this.l10n.t('Ticket max price should be greater than 0')
+            },
+            {
+              type   : 'checkMaxMin',
+              prompt : this.l10n.t('Ticket max price should be greater than min price')
+            }
+          ]
+        },
         paypalEmail: {
           identifier : 'paypal_email',
           rules      : [

app/components/public/ticket-list.js

@@ -15,8 +15,8 @@ export default Component.extend(FormMixin, {
       && !this.get('authManager.currentUser.isVerified');
   }),
 
-  shouldDisableOrderButton: computed('isUnverified', 'hasTicketsInOrder', function() {
-    return !this.hasTicketsInOrder;
+  shouldDisableOrderButton: computed('hasTicketsInOrder', 'isDonationPriceValid', function() {
+    return !(this.hasTicketsInOrder && this.isDonationPriceValid);
   }),
 
   showTaxIncludedMessage: computed('taxInfo.isTaxIncludedInPrice', function() {
@@ -40,7 +40,23 @@ export default Component.extend(FormMixin, {
     ) > 0;
   }),
 
-  total: computed('[email protected]', '[email protected]', function() {
+  donationTickets: computed.filterBy('data', 'type', 'donation'),
+
+  isDonationPriceValid: computed('[email protected]', '[email protected]', function() {
+    let returnValue = false;
+    this.donationTickets.forEach(donationTicket => {
+      if (donationTicket.orderQuantity >= 0) {
+        if (donationTicket.price >= donationTicket.minPrice) {
+          returnValue = true;
+        } else {
+          returnValue = false;
+        }
+      }
+    });
+    return returnValue;
+  }),
+
+  total: computed('[email protected]', '[email protected]', '[email protected]', function() {
     if (this.taxInfo !== null) {
       return sumBy(this.tickets.toArray(),
         ticket => (ticket.ticketPriceWithTax || 0) * (ticket.orderQuantity || 0)
@@ -190,6 +206,19 @@ export default Component.extend(FormMixin, {
               prompt : this.l10n.t('Please enter the promotional Code')
             }
           ]
+        },
+        price: {
+          identifier : 'price',
+          rules      : [
+            {
+              type   : 'number',
+              prompt : this.l10n.t('Invalid number')
+            },
+            {
+              type   : 'integer[1..]',
+              prompt : this.l10n.t('Donation should be greater than 0')
+            }
+          ]
         }
       }
     };

app/models/ticket.js

@@ -21,7 +21,7 @@ export default ModelBase.extend({
   salesEndsAt          : attr('moment', { defaultValue: () => moment().add(10, 'days').startOf('day') }),
   minOrder             : attr('number', { defaultValue: 1 }),
   maxOrder             : attr('number', { defaultValue: 10 }),
-  minPrice             : attr('number'),
+  minPrice             : attr('number', { defaultValue: 1 }),
   maxPrice             : attr('number'),
   isFeeAbsorbed        : attr('boolean', { defaultValue: true }),
   position             : attr('number'),

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

@@ -16,6 +16,9 @@
             <td>
               <div class="ui small">
                 {{ticket.name}}
+                {{#if (eq ticket.type 'donation')}}
+                  {{ui-popup tagName="i" class="info icon" content=(concat "Donation value should be greater than " ticket.minPrice " " eventCurrency)}}
+                {{/if}}
               </div>
               {{#if ticket.isDescriptionVisible}}
                 <small class="ui gray-text tiny">{{ticket.description}}</small>
@@ -47,7 +50,13 @@
               </td>
             {{else}}
               <td id="{{ticket.id}}_price">
-                {{currency-symbol eventCurrency}} {{format-number ticket.price}}
+                {{#if (eq ticket.type 'donation') }}
+                  <div class="field">
+                    {{input type='number' name="price" placeholder=(t 'Enter Donation') min=ticket.minPrice max=ticket.maxPrice value=ticket.price}}<br>
+                  </div>
+                {{else}}
+                  {{currency-symbol eventCurrency}} {{format-number ticket.price}}
+                {{/if}}
                 {{#if (and taxInfo (not-eq ticket.type 'free'))}}
                   {{#if showTaxIncludedMessage}}
                     <small class="ui gray-text small">
@@ -63,22 +72,6 @@
                   </div>
                 {{/if}}
               </td>
-              {{#if (eq ticket.type 'donation') }}
-                <div class="three wide column">
-                  <td id="{{ticket.id}}_price">{{input type='number' value=ticket.price}}</td>
-                </div>
-              {{else}}
-                {{#if ticket.discount}}
-                  <td>
-                    <div id="{{ticket.id}}_price" class="strike text">
-                      {{currency-symbol eventCurrency}} {{format-number ticket.price}}
-                    </div>
-                    <div id="{{ticket.id}}_discount">
-                      {{currency-symbol eventCurrency}} {{format-number (sub ticket.price ticket.discount)}}
-                    </div>
-                  </td>
-                {{/if}}
-              {{/if}}
             {{/if}}
             <td>
               <div class="field">

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

@@ -12,10 +12,10 @@
     {{else if (eq ticket.type 'donation')}}
       <div class="two fields">
         <div class="field">
-          {{input type='number' name='min_price' placeholder=(t 'Min') value=ticket.minOrder}}
+          {{input type='number' name='min_price' placeholder=(t 'Min') value=ticket.minPrice min=1}}
         </div>
         <div class="field">
-          {{input type='number' name='max_price' placeholder=(t 'Max') value=ticket.maxOrder}}
+          {{input type='number' name='max_price' placeholder=(t 'Max') value=ticket.maxPrice min=1}}
         </div>
       </div>
     {{else if (eq ticket.type 'free')}}
@@ -26,19 +26,11 @@
       </div>
     {{/if}}
   </div>
-  {{#if (eq ticket.type 'donation')}}
-    <div class="four wide column">
-      <span class="text muted ticket-input">
-        {{t 'This is a Donation Ticket'}}
-      </span>
-    </div>
-  {{else}}
-    <div class="four wide column">
-      <div class="field">
-        {{input type='number' name='ticket_quantity' placeholder=(t 'Quantity') value=ticket.maxOrder min=1}}
-      </div>
+  <div class="four wide column">
+    <div class="field">
+      {{input type='number' name='ticket_quantity' placeholder=(t 'Quantity') value=ticket.quantity min=1}}
     </div>
-  {{/if}}
+  </div>
   <div class="column {{unless device.isLargeMonitor 'less right padding'}}">
     <div class="field">
       <div class="ui icon buttons">