Andrew Ingram
d4e6e6cc6f
Updated extra-views to later revision which changes the classnames to follow Django's conventions, eg FormSetView rather than FormsetView.
Fixed issue with modelformsets not saving because we weren't calling the superclass' form_valid method.
14 years ago
David Winterbottom
b2c8270e29
Converted final two apps over to new structure
14 years ago
David Winterbottom
cccce7aa71
Converted order management app to new structure
14 years ago
David Winterbottom
4521e1b2e2
Converted promotions app to new structure
14 years ago
David Winterbottom
4b3124cc4b
Converted checkout app to new structure
14 years ago
David Winterbottom
da8b0902a6
Moved all templates into app folders
14 years ago
David Winterbottom
512c977be5
Merge branch 'andrews-tidying-branch'
Tidied up a few bits too
Conflicts:
oscar/apps/basket/urls.py
oscar/apps/checkout/urls.py
oscar/apps/checkout/views.py
oscar/apps/customer/urls.py
oscar/apps/customer/views.py
oscar/apps/dynamic_images/__init__.py
oscar/apps/dynamic_images/response_backends.py
oscar/apps/product/management/commands/import_images.py
oscar/apps/product/reviews/urls.py
oscar/apps/product/urls.py
oscar/apps/product/utils.py
oscar/templates/oscar/checkout/checkout.html
14 years ago
David Winterbottom
39dd0b6508
Corrected all exceptions to use pep8 naming convention
14 years ago
David Winterbottom
efa5e70ba7
Fixed bug with basket view
14 years ago
David Winterbottom
0dd0f384fd
Lots of minor tidy-up/pep8 related things - plus fixed lots of broken
tests
14 years ago
David Winterbottom
1eb5dc0656
Removed class_based_view - not required any more
14 years ago
David Winterbottom
e3f2da7bd1
Removed dependencies from setup.py for time being - they make reinstallation too time consuming
14 years ago
Andrew Ingram
3348cfbd5b
Merge branch 'tidying' of github.com:AndrewIngram/django-oscar into tidying
14 years ago
Andrew Ingram
680601c33d
Fixed exception caused by anonymous users accessing basket summary
14 years ago
Andrew Ingram
71008a0c60
Checkout IndexView now subclasses AccountAuthView
Uses a different template and redirect for logged-in users
14 years ago
Andrew Ingram
8d6cd7d8c5
Added Customer Login/Registration
Uses a class-based reimplementation of Django's existing function-based login view. The view also handles registration at the same URL endpoint. It depends on the submit button having a name of "login" or "registration" to determine which form was POSTed.
Auth is done using email addresses rather than username (which is a randomly generated string). The registration process enforces uniqueness, but this won't be enforced anywhere else, so we need to be careful not to duplicate email addresses in the admin or something.
14 years ago
David Winterbottom
25f35dcde1
Added checkout session mixin to shipping address view
14 years ago
David Winterbottom
224b037a44
Merged checkout session methods
14 years ago
David Winterbottom
34b4496537
Further tidy-up of refactored checkout classes
14 years ago
David Winterbottom
37b2735d86
Updated remaining checkout views to use generic class-based views - more refactoring required still though
14 years ago
David Winterbottom
d556523a4b
Slight modification to how frozen baskets are stored
14 years ago
AndrewIngram
e7b134e578
Edited oscar/apps/product/abstract_models.py via GitHub
14 years ago
AndrewIngram
94a1c1f8c3
Edited oscar/apps/product/abstract_models.py via GitHub
14 years ago
AndrewIngram
ca74617a05
Edited requirements-dev.txt via GitHub
14 years ago
Andrew Ingram
63175fb31a
Added Categories to Items.
Categories are hierarchies, modelled using django-treebeard and the "Materialized Path" model. Each product can exist in multiple categories, with one flagged as canonical (not yet constrained to just one).
Categories can be added to a product with item.add_category_from_breadcrumbs(string)
The string should be in the form of a simple breadcrumb trail, eg:
"Books > Fantasy > Epic"
The string gets split on the '>' character and converted into categories (they get created if they don't already exist.
There's also a CategoryView which lets you browse the products via the hierarchy, doesn't yet support search queries or faceting.
14 years ago
Andrew Ingram
bd792c14d2
Fixed some errors caused by my refactorings
14 years ago
Andrew Ingram
17173da45d
Moved customer templates to the customer app
Removed some templates that shouldn't really be defined by oscar
14 years ago
Andrew Ingram
3074f1f77a
Basket template is now tidier for empty carts
14 years ago
Andrew Ingram
8b03de8952
Fixed basket url on checkout template
14 years ago
Andrew Ingram
d6567c73c1
Removed import_module from basket admin
14 years ago
Andrew Ingram
b96b1c10ca
These commits are all fairly broken, need to get back to a working state.
14 years ago
Andrew Ingram
ae7db8b484
Trying different names for View objects now, getting bored of putting View at the end of everything
14 years ago
Andrew Ingram
dc74d953ec
fixed oscar.view/s import
14 years ago
Andrew Ingram
5313fc2918
Refactored apps to use app_label.app, this is to stop __init__.py executing get_model calls before the installed apps get installed.
Basket app now uses Application object
14 years ago
David Winterbottom
5afa83c327
Converted shipping method view to generic class-based view
14 years ago
David Winterbottom
861f02d30a
Updated checkout views.
Users can now add/edit/delete their USER addresses
from the checkout shipping address view.
14 years ago
Andrew Ingram
d8d06471c4
Merge branch 'master' of git://github.com/tangentlabs/django-oscar into tidying
Conflicts:
oscar/apps/basket/views.py
oscar/apps/checkout/views.py
oscar/apps/customer/views.py
oscar/apps/product/reviews/views.py
oscar/apps/product/views.py
oscar/apps/promotions/urls.py
oscar/templates/oscar/checkout/gateway.html
14 years ago
David Winterbottom
47db825bc2
Merge branch 'master' into refactored-checkout-classes
Conflicts:
oscar/apps/customer/views.py
14 years ago
David Winterbottom
f801e5d06b
Corrected docblock of test decorator and reverted commented out tests
14 years ago
David Winterbottom
11a85900ab
Added environmental logging, and PCI formatter - plus tests
14 years ago
David Winterbottom
c1a2286d83
Moved fields to oscar.forms package to match Django convention
14 years ago
David Winterbottom
e88363f24a
Renamed oscar.view to oscar.views to be consistent with Django
convention
14 years ago
David Winterbottom
496a145bc5
Added dataProvider decorator
14 years ago
David Winterbottom
198ecb8120
Added a long_description field to setup.py
14 years ago
David Winterbottom
680ddbad2d
Copied the versioning system from django
14 years ago
David Winterbottom
7c2e03a3fe
Fixed tests
14 years ago
David Winterbottom
fc0d3e70ca
Updated shipping address views in checkout - not finished yet
14 years ago
Andrew Ingram
c0a0d81d42
Removed basket and product templates from 'master' templates folder in favour of the ones in each app
14 years ago
Andrew Ingram
a976882f31
More work on basket views, decided to steer away from anything clever and use different views to handle different functionality.
14 years ago
David Winterbottom
aa104f516c
Added Twill to list of reqs
14 years ago