Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5678 from edx/cdodge/shoppingcart-rewrite-hotfix1

Browse Source 
css fix of remove icon and Fixed a bug where the discount coupon applied...
This commit is contained in:
chrisndodge
2014-10-22 09:47:08 -04:00
parent 7dc13508cb b0802aafc8
commit 228c513dd3
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/djangoapps/shoppingcart/models.py
View File

@@ -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()

3
lms/static/sass/views/_shoppingcart.scss
View File

@@ -479,6 +479,9 @@
pointer-events: none;
}
}
.no-width {
width: 0px !important;
}
.col-3{
width: 100px;
float: right;

2
lms/templates/shoppingcart/shopping_cart.html
View File

@@ -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>