Skip to content

Commit e932820

Browse files
dianakhuangdianakhuang
committed
Add a created field to OrderItem.
1 parent 5d92019 commit e932820

File tree

2 files changed

+226
-1
lines changed

2 files changed

+226
-1
lines changed

‎lms/djangoapps/shoppingcart/migrations/0021_auto__add_field_orderitem_created__add_field_orderitem_modified.py

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
1+
# -*- coding: utf-8 -*-
2+
import datetime
3+
from south.db import db
4+
from south.v2 import SchemaMigration
5+
from django.db import models
6+
7+
8+
class Migration(SchemaMigration):
9+
10+
def forwards(self, orm):
11+
# Adding field 'OrderItem.created'
12+
db.add_column('shoppingcart_orderitem', 'created',
13+
self.gf('model_utils.fields.AutoCreatedField')(default=datetime.datetime.now),
14+
keep_default=False)
15+
16+
# Adding field 'OrderItem.modified'
17+
db.add_column('shoppingcart_orderitem', 'modified',
18+
self.gf('model_utils.fields.AutoLastModifiedField')(default=datetime.datetime.now),
19+
keep_default=False)
20+
21+
22+
def backwards(self, orm):
23+
# Deleting field 'OrderItem.created'
24+
db.delete_column('shoppingcart_orderitem', 'created')
25+
26+
# Deleting field 'OrderItem.modified'
27+
db.delete_column('shoppingcart_orderitem', 'modified')
28+
29+
30+
models = {
31+
'auth.group': {
32+
'Meta': {'object_name': 'Group'},
33+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
34+
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
35+
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
36+
},
37+
'auth.permission': {
38+
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
39+
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
40+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
41+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
42+
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
43+
},
44+
'auth.user': {
45+
'Meta': {'object_name': 'User'},
46+
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
47+
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
48+
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
49+
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
50+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
51+
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
52+
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
53+
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
54+
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
55+
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
56+
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
57+
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
58+
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
59+
},
60+
'contenttypes.contenttype': {
61+
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
62+
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
63+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
64+
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
65+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
66+
},
67+
'shoppingcart.certificateitem': {
68+
'Meta': {'object_name': 'CertificateItem', '_ormbases': ['shoppingcart.OrderItem']},
69+
'course_enrollment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['student.CourseEnrollment']"}),
70+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '128', 'db_index': 'True'}),
71+
'mode': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
72+
'orderitem_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['shoppingcart.OrderItem']", 'unique': 'True', 'primary_key': 'True'})
73+
},
74+
'shoppingcart.coupon': {
75+
'Meta': {'object_name': 'Coupon'},
76+
'code': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
77+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255'}),
78+
'created_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 11, 6, 0, 0)'}),
79+
'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
80+
'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
81+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
82+
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
83+
'percentage_discount': ('django.db.models.fields.IntegerField', [], {'default': '0'})
84+
},
85+
'shoppingcart.couponredemption': {
86+
'Meta': {'object_name': 'CouponRedemption'},
87+
'coupon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Coupon']"}),
88+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
89+
'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Order']"}),
90+
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
91+
},
92+
'shoppingcart.courseregcodeitem': {
93+
'Meta': {'object_name': 'CourseRegCodeItem', '_ormbases': ['shoppingcart.OrderItem']},
94+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '128', 'db_index': 'True'}),
95+
'mode': ('django.db.models.fields.SlugField', [], {'default': "'honor'", 'max_length': '50'}),
96+
'orderitem_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['shoppingcart.OrderItem']", 'unique': 'True', 'primary_key': 'True'})
97+
},
98+
'shoppingcart.courseregcodeitemannotation': {
99+
'Meta': {'object_name': 'CourseRegCodeItemAnnotation'},
100+
'annotation': ('django.db.models.fields.TextField', [], {'null': 'True'}),
101+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
102+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
103+
},
104+
'shoppingcart.courseregistrationcode': {
105+
'Meta': {'object_name': 'CourseRegistrationCode'},
106+
'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
107+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
108+
'created_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 11, 6, 0, 0)'}),
109+
'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_by_user'", 'to': "orm['auth.User']"}),
110+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
111+
'invoice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Invoice']", 'null': 'True'}),
112+
'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'purchase_order'", 'null': 'True', 'to': "orm['shoppingcart.Order']"})
113+
},
114+
'shoppingcart.donation': {
115+
'Meta': {'object_name': 'Donation', '_ormbases': ['shoppingcart.OrderItem']},
116+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
117+
'donation_type': ('django.db.models.fields.CharField', [], {'default': "'general'", 'max_length': '32'}),
118+
'orderitem_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['shoppingcart.OrderItem']", 'unique': 'True', 'primary_key': 'True'})
119+
},
120+
'shoppingcart.donationconfiguration': {
121+
'Meta': {'object_name': 'DonationConfiguration'},
122+
'change_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
123+
'changed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.PROTECT'}),
124+
'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
125+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
126+
},
127+
'shoppingcart.invoice': {
128+
'Meta': {'object_name': 'Invoice'},
129+
'address_line_1': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
130+
'address_line_2': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
131+
'address_line_3': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
132+
'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
133+
'company_contact_email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
134+
'company_contact_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
135+
'company_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
136+
'country': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
137+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
138+
'customer_reference_number': ('django.db.models.fields.CharField', [], {'max_length': '63', 'null': 'True'}),
139+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
140+
'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
141+
'is_valid': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
142+
'recipient_email': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
143+
'recipient_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
144+
'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
145+
'total_amount': ('django.db.models.fields.FloatField', [], {}),
146+
'zip': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True'})
147+
},
148+
'shoppingcart.order': {
149+
'Meta': {'object_name': 'Order'},
150+
'bill_to_cardtype': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
151+
'bill_to_ccnum': ('django.db.models.fields.CharField', [], {'max_length': '8', 'blank': 'True'}),
152+
'bill_to_city': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
153+
'bill_to_country': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
154+
'bill_to_first': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
155+
'bill_to_last': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
156+
'bill_to_postalcode': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}),
157+
'bill_to_state': ('django.db.models.fields.CharField', [], {'max_length': '8', 'blank': 'True'}),
158+
'bill_to_street1': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
159+
'bill_to_street2': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
160+
'company_contact_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
161+
'company_contact_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
162+
'company_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
163+
'currency': ('django.db.models.fields.CharField', [], {'default': "'usd'", 'max_length': '8'}),
164+
'customer_reference_number': ('django.db.models.fields.CharField', [], {'max_length': '63', 'null': 'True', 'blank': 'True'}),
165+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
166+
'order_type': ('django.db.models.fields.CharField', [], {'default': "'personal'", 'max_length': '32'}),
167+
'processor_reply_dump': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
168+
'purchase_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
169+
'recipient_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
170+
'recipient_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
171+
'refunded_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
172+
'status': ('django.db.models.fields.CharField', [], {'default': "'cart'", 'max_length': '32'}),
173+
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
174+
},
175+
'shoppingcart.orderitem': {
176+
'Meta': {'object_name': 'OrderItem'},
177+
'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
178+
'currency': ('django.db.models.fields.CharField', [], {'default': "'usd'", 'max_length': '8'}),
179+
'fulfilled_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
180+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
181+
'line_desc': ('django.db.models.fields.CharField', [], {'default': "'Misc. Item'", 'max_length': '1024'}),
182+
'list_price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '30', 'decimal_places': '2'}),
183+
'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
184+
'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Order']"}),
185+
'qty': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
186+
'refund_requested_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
187+
'report_comments': ('django.db.models.fields.TextField', [], {'default': "''"}),
188+
'service_fee': ('django.db.models.fields.DecimalField', [], {'default': '0.0', 'max_digits': '30', 'decimal_places': '2'}),
189+
'status': ('django.db.models.fields.CharField', [], {'default': "'cart'", 'max_length': '32', 'db_index': 'True'}),
190+
'unit_cost': ('django.db.models.fields.DecimalField', [], {'default': '0.0', 'max_digits': '30', 'decimal_places': '2'}),
191+
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
192+
},
193+
'shoppingcart.paidcourseregistration': {
194+
'Meta': {'object_name': 'PaidCourseRegistration', '_ormbases': ['shoppingcart.OrderItem']},
195+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '128', 'db_index': 'True'}),
196+
'mode': ('django.db.models.fields.SlugField', [], {'default': "'honor'", 'max_length': '50'}),
197+
'orderitem_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['shoppingcart.OrderItem']", 'unique': 'True', 'primary_key': 'True'})
198+
},
199+
'shoppingcart.paidcourseregistrationannotation': {
200+
'Meta': {'object_name': 'PaidCourseRegistrationAnnotation'},
201+
'annotation': ('django.db.models.fields.TextField', [], {'null': 'True'}),
202+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
203+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
204+
},
205+
'shoppingcart.registrationcoderedemption': {
206+
'Meta': {'object_name': 'RegistrationCodeRedemption'},
207+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
208+
'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.Order']", 'null': 'True'}),
209+
'redeemed_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 11, 6, 0, 0)', 'null': 'True'}),
210+
'redeemed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
211+
'registration_code': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['shoppingcart.CourseRegistrationCode']"})
212+
},
213+
'student.courseenrollment': {
214+
'Meta': {'ordering': "('user', 'course_id')", 'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'},
215+
'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
216+
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
217+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
218+
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
219+
'mode': ('django.db.models.fields.CharField', [], {'default': "'honor'", 'max_length': '100'}),
220+
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
221+
}
222+
}
223+
224+
complete_apps = ['shoppingcart']

‎lms/djangoapps/shoppingcart/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from django.db.models import Sum
2222
from django.core.urlresolvers import reverse
2323
from model_utils.managers import InheritanceManager
24+
from model_utils.models import TimeStampedModel
2425
from django.core.mail.message import EmailMessage
2526

2627
from xmodule.modulestore.django import modulestore
@@ -434,7 +435,7 @@ def generate_receipt_instructions(self):
434435
return instruction_dict, instruction_set
435436

436437

437-
class OrderItem(models.Model):
438+
class OrderItem(TimeStampedModel):
438439
"""
439440
This is the basic interface for order items.
440441
Order items are line items that fill up the shopping carts and orders.

0 commit comments

Comments
 (0)