From b0802aafc877775c716650d4ca8c3bf15ad3e12e Mon Sep 17 00:00:00 2001
From: Muhammad Shoaib <muhammad.shoaib@arbisoft.com>
Date: Wed, 22 Oct 2014 16:18:50 +0500
Subject: [PATCH] =?UTF-8?q?css=20fix=20of=20remove=20icon=20and=20Fixed=20?=
 =?UTF-8?q?a=20bug=20where=20the=20discount=20coupon=20applied=20=E2=80=98?=
 =?UTF-8?q?disappeared=E2=80=99=20=20when=20changing=20the=20quantity=20be?=
 =?UTF-8?q?tween=20enrollment=20vs=20reg=20code=20cart=20types.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lms/djangoapps/shoppingcart/models.py         | 13 ++++++++++---
 lms/static/sass/views/_shoppingcart.scss      |  3 +++
 lms/templates/shoppingcart/shopping_cart.html |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/shoppingcart/models.py b/lms/djangoapps/shoppingcart/models.py
index 4864d930f9..84c6a096fc 100644
--- a/lms/djangoapps/shoppingcart/models.py
+++ b/lms/djangoapps/shoppingcart/models.py
@@ -223,14 +223,21 @@ class Order(models.Model):
         if is_order_type_business:
             for cart_item in cart_items:
                 if hasattr(cart_item, 'paidcourseregistration'):
-                    CourseRegCodeItem.add_to_order(self, cart_item.paidcourseregistration.course_id, cart_item.qty)
+                    course_reg_code_item = CourseRegCodeItem.add_to_order(self, cart_item.paidcourseregistration.course_id, cart_item.qty)
+                    # update the discounted prices if coupon redemption applied
+                    course_reg_code_item.list_price = cart_item.list_price
+                    course_reg_code_item.unit_cost = cart_item.unit_cost
+                    course_reg_code_item.save()
                     items_to_delete.append(cart_item)
         else:
             for cart_item in cart_items:
                 if hasattr(cart_item, 'courseregcodeitem'):
-                    PaidCourseRegistration.add_to_order(self, cart_item.courseregcodeitem.course_id)
+                    paid_course_registration = PaidCourseRegistration.add_to_order(self, cart_item.courseregcodeitem.course_id)
+                    # update the discounted prices if coupon redemption applied
+                    paid_course_registration.list_price = cart_item.list_price
+                    paid_course_registration.unit_cost = cart_item.unit_cost
+                    paid_course_registration.save()
                     items_to_delete.append(cart_item)
-                    # CourseRegCodeItem.add_to_order
 
         for item in items_to_delete:
             item.delete()
diff --git a/lms/static/sass/views/_shoppingcart.scss b/lms/static/sass/views/_shoppingcart.scss
index 65dcd8c00d..b4d8eaea4f 100644
--- a/lms/static/sass/views/_shoppingcart.scss
+++ b/lms/static/sass/views/_shoppingcart.scss
@@ -479,6 +479,9 @@
             pointer-events: none;
           }
         }
+        .no-width {
+          width: 0px !important;
+        }
         .col-3{
           width: 100px;
           float: right;
diff --git a/lms/templates/shoppingcart/shopping_cart.html b/lms/templates/shoppingcart/shopping_cart.html
index 0bd92f3882..449a320731 100644
--- a/lms/templates/shoppingcart/shopping_cart.html
+++ b/lms/templates/shoppingcart/shopping_cart.html
@@ -58,7 +58,7 @@ from django.utils.translation import ugettext as _
             </div>
               </div>
 
-            <div class="col-3">
+            <div class="col-3 no-width">
                <a href="#" class="btn-remove" data-item-id="${item.id}"><i class="icon-remove-sign"></i></a>
             </div>
         </div>