Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #4

Merged
merged 18 commits into from
May 31, 2013
Merged

Develop #4

merged 18 commits into from
May 31, 2013

Conversation

pnegahdar
Copy link
Contributor

Base stuff

@pnegahdar
Hide pycharm (.idea)
454d492
@pnegahdar
Outline project
4558e61
@pnegahdar
Moved files, added virtualenv (& requirements.txt)
f99c872
@pnegahdar
Db settings started
69fc6a0
@pnegahdar
Started Plan stuff.
ca68107
@pnegahdar
More plan work
ffdd333
@pnegahdar
Added json type to sqlachemy, continuing work on plans.
53bdae0
@pnegahdar
Swapped json with ujson since it's faster.
e405840
@pnegahdar
1) Swapped out json for ujson in the json object
a287229 
2) Switched trial_days to trial_interval to have much trial flexibility
3) Documented plan objects
4) trial_interval and plan_interval now use dictionaries to define the intervals

Next: Testing the plans.
@pnegahdar
1) Fixed DB engine
2467855 
2) Wrote plan tests, all pass
3) Fixed plan query statements
4) Added uniqueconstraint of on plan_id AND marketplace
5) Datetimes now use UTC timezone
6) Created create_table script
7) Added billy error clasess: NotFoundError, BadIntervalError, and AlreadyExistsError
@pnegahdar
1) Created coupon models
245dffe 
2) Created coupon access methods

Next: Coupon tests
@pnegahdar
Coupon Testing
d4ea33b
@pnegahdar
Moved things closer to the final directory structure.
86a1832
@pnegahdar
Started customer and invoices models, needs more work…
378a76c
@pnegahdar
1) Wrote many of the customer utils
6bd845d 
2) Created InactiveObjectError
@pnegahdar
Fixed coupon test names
7153d45
@pnegahdar
1) Fixed flow controls for utils
63d2d83 
2) Updated invoice models.
@pnegahdar
1) Updated coupon/plan relationship, included backref
1cc78e6 
2) Added active_only to plan/coupon retrieval
3) Split JSONobj into JSONDict and JSONList
4) Removed unecessary inactive_object error
5) Updated invoice object
mahmoudimus added a commit that referenced this pull request May 31, 2013
@mahmoudimus
Merge pull request #4 from pnegahdar/develop
b5423de 
Develop
@mahmoudimus mahmoudimus merged commit b5423de into balanced:master May 31, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pnegahdar @mahmoudimus