Discount gets applied to selected tickets only (#2983)

Author: magdalenesuo

app/templates/gentelella/guest/event/_ticketing_box.html

@@ -70,7 +70,7 @@ <h3 class="panel-title">{{ _("Ticket Information") }}</h3>
                                         <td>
                                             <input type="hidden" name="ticket_ids[]" value="{{ ticket.id }}">
                                             <select title="ticket quantity" name="ticket_quantities[]" class="quantity-select"
-                                                    data-rate="{{ ticket.price }}" data-fee="{% if not ticket.absorb_fees %}
+                                                    data-rate="{{ ticket.price }}" data-id="{{ticket.id}}" data-fee="{% if not ticket.absorb_fees %}
                                             {% if fee < fees.maximum_fee %}
                                                 {{ ticket.price * fees.service_fee / 100}}
                                             {% else %}
@@ -225,7 +225,7 @@ <h3 class="panel-title">{{ _("Ticket Information") }}</h3>
                                         <td>\
                                             <input type=\"hidden\" name=\"ticket_ids[]\" value=\"{{ ticket.id }}\">\
                                             <select title=\"ticket quantity\" name=\"ticket_quantities[]\" class=\"quantity-select\"\
-                                                    data-rate=\"{{ ticket.price }}\" data-fee=\"{% if not ticket.absorb_fees %}\
+                                                    data-rate=\"{{ ticket.price }}\" data-id=\"{{ticket.id}}\" data-fee=\"{% if not ticket.absorb_fees %}\
                                             {% if fee < fees.maximum_fee %}\
                                                 {{ ticket.price * fees.service_fee / 100}}\
                                             {% else %}\
@@ -262,6 +262,7 @@ <h3 class="panel-title">{{ _("Ticket Information") }}</h3>
         var discount_type = "";
         var discount_amount = -1;
         var promo_code_status = 0;
+        var discount_code = "";
         $('#apply-discount').click(function (e) {
             if (promo_code_status == 0) {
                 var form_data = $('#ticketing-box-form').serialize();
@@ -274,6 +275,7 @@ <h3 class="panel-title">{{ _("Ticket Information") }}</h3>
                     discount_status = data.discount_status;
                     access_status = data.access_status;
                     access_code = data.access_code_ticket;
+                    discount_code = data.discount_code_ticket;
                     if(discount_status && access_status){
                         discount_type = data.discount_type;
                         discount_amount = data.discount_amount;
@@ -306,10 +308,16 @@ <h3 class="panel-title">{{ _("Ticket Information") }}</h3>
             var total = 0;
             $.each($quantitySelects, function (index, $quantitySelect) {
                 $quantitySelect = $($quantitySelect);
+                var ticket_id = $quantitySelect.data('id');
                 if ($quantitySelect.val() !== "0") {
                     total += (parseFloat($quantitySelect.data('rate')) + parseFloat($quantitySelect.data('fee'))) * parseFloat($quantitySelect.val());
-                    if(discount_status && discount_type == "amount"){
-                        discount_total += discount_amount * parseFloat($quantitySelect.val());
+                    if (discount_code.split(",").indexOf(""+ticket_id) != -1){
+                        if(discount_status && discount_type == "amount"){                      
+                            discount_total += discount_amount * parseFloat($quantitySelect.val());
+                        }
+                        else if(discount_status && discount_type != "amount"){
+                            discount_total += (discount_amount * parseFloat($quantitySelect.val())* parseFloat($quantitySelect.data('rate'))/100.0)
+                        }
                     }
                     hasMoreThenZero = true;
                 }
@@ -319,9 +327,7 @@ <h3 class="panel-title">{{ _("Ticket Information") }}</h3>
             $this.closest("tr").find(".subtotal").text("{{ event.payment_currency | currency_symbol }} " + subtotal.toFixed(2));
 
             if (discount_status || (discount_status && access_status)){
-                if(discount_type != "amount"){
-                    discount_total = ((discount_amount * total)/100)
-                }
+                
                 $('#discount-error').text("Discount Applied");
                 $('#discount-row').show();
                 $('#total-discount').text("{{ event.payment_currency | currency_symbol }} " + discount_total.toFixed(2));

app/views/public/ticketing.py

@@ -47,13 +47,15 @@ def apply_promo():
             'discount_status': True,
             'access_status': True,
             'access_code_ticket': access_code.tickets,
+            'discount_code_ticket': discount.tickets,
         })
     elif discount:
         return jsonify({
             'discount_type': discount.type,
             'discount_amount': discount.value,
             'discount_status': True,
             'access_status': False,
+            'discount_code_ticket': discount.tickets,
         })
     elif access_code:
         return jsonify({