David Winterbottom
d643d75473
Add currency tag where currency can be passed in
Needed when your site starts supporting multicurrency things
12 年之前
David Winterbottom
4a0c7eff6d
Add billing_address as a kwarg of creating order models
This prevents issue where it gets passed as an order kwarg but then gets
created separately as well.
12 年之前
David Winterbottom
2fcf5cf49a
Fix validation issue with basket formset
The new price_currency field was not explicitly being excluded.
12 年之前
David Winterbottom
c9175d2575
Further checkout enhancements
- build_submission now has kwargs passed to it so it can extract
information from any forms that might be in use.
- the place_order function has been modified to use the passed in user,
rather than using self.request.user
12 年之前
David Winterbottom
bb78408021
Use order_total as the submission var name (not total)
12 年之前
David Winterbottom
6f31bd894a
Don't propagate checkout logging
To avoid duplicate log messages
12 年之前
David Winterbottom
93bec29731
Sandbox deferred offer now returns a description
12 年之前
David Winterbottom
2b8466d45d
Rework checkout to avoid implicit loading
The PaymentDetailsView.submit method now requires more things to be
passed in explicitly to create the order.
12 年之前
David Winterbottom
be722da1f3
Pass price object around instead of Decimal
This allows payment processing to know the currency of the total.
12 年之前
David Winterbottom
a13b700e9b
Store currency with order
To support multi-currency sites. This commit also made the order totals
a mandatory input for creating an order, which meant quite a few tests
had to change to support the new API.
12 年之前
David Winterbottom
506db8fc2c
Rename migration
To solve dupliate numbering issue after merge from master.
12 年之前
David Winterbottom
3fd9c9b634
Add currency field to basket line
Plus provide a currency property on the basket itself.
12 年之前
David Winterbottom
1a4400478b
Adjust core pricing policies to have a currency attribute
12 年之前
David Winterbottom
369f763805
Allow stockrecord currency to be set in test factory
12 年之前
David Winterbottom
1961c4ef58
Pass shipping method/address into submission methods
This means it's easier to apply taxes to the shipping method. Without
this, the shipping method was reloaded each time it was needed which
made it difficult to apply taxes only once.
12 年之前
David Winterbottom
ac77e00bc6
New labels for shipping address details
Taking lead from Meridian project.
12 年之前
David Winterbottom
5432bd4f46
Show tax exclusive price on preview (if appropriate)
12 年之前
David Winterbottom
b14d949fad
Fix issue with determining a basket line warning
This gets tricky when some lines have tax but some don't. We don't look
for a warning when the tax is not defined.
12 年之前
David Winterbottom
bb5c2ed161
Use title block in checkout templates
I spotted that the order confirmation page didn't have a title saying
that it was a confirmation. This fix addresses that and adds titles to
other templates to be consistent.
12 年之前
David Winterbottom
23c0572016
Rework order total calculator
It now returns a OrderTotal instance which has price fields with- and
without tax.
12 年之前
David Winterbottom
9e66c89d93
Don't silently revert to free shipping
We now check that a valid shiping method can be looked by its code, not
just that a code is set in the session. This avoids the case of
silently reverting back to free shipping.
Fixes #801
12 年之前
David Winterbottom
a62b5011f9
Tighten up checkout session methods
Some method defaults have been removed to make it more explicit when
things are loaded.
12 年之前
David Winterbottom
c195382d12
Allow tax to be set on a shipping method
12 年之前
David Winterbottom
7284c57cda
Fix checkout pre-condition checking
I prematurely refactored without thinking through the implications.
12 年之前
David Winterbottom
1cff7be95a
Fix tax-related test issues
Should have checked this before pushing before...
12 年之前
David Winterbottom
1dfbade229
Assert tax must be set before submission (not in dispatch)
12 年之前
David Winterbottom
5c4b9e85c5
Fix bug with category dropdown
It was using the wrong template variables...
12 年之前
David Winterbottom
95391920dd
Support shipping methods when tax isn't known
The core API now has an is_tax_known property.
Related to #805
12 年之前
David Winterbottom
10c92f5946
Annotate shipping tests
12 年之前
David Winterbottom
59bb66a415
Document testrunner with some example usage
12 年之前
David Winterbottom
bd77a9e6aa
Reorganise shipping tests
Split into unit, integration etc.
12 年之前
David Winterbottom
986297563d
Use properties for shipping charges
Use charge_incl_tax instead of basket_charge_incl_tax(). This is
clearer.
Backwards compatible versions of the old methods are kept for now.
Related to #805
12 年之前
David Winterbottom
207a04ac98
Don't call Basket.all_lines when merging
Merging happens from middleware, before a strategy has been assigned.
If we use all_lines then this causes an error, so we deliberately use
the normal related manger method.
12 年之前
David Winterbottom
082ba8f3c4
Merge branch 'master' into issue/764/partner-strategy
Conflicts:
oscar/apps/catalogue/abstract_models.py
oscar/templates/oscar/basket/partials/basket_content.html
oscar/templates/oscar/basket/partials/basket_totals.html
tests/unit/partner/model_tests.py
12 年之前
David Winterbottom
4214fbbb7d
Extract method in shipping address form
To make it easier to override in subclasses.
Please enter the commit message for your changes. Lines starting
12 年之前
David Winterbottom
032e930262
Update 0.6 release docs with note on partner addresses
12 年之前
David Winterbottom
4019776d48
Merge pull request #766
Fixes #766
12 年之前
David Winterbottom
c399b85c80
Add new blocks to basket templates
To make it easier to customise small parts of the template.
12 年之前
David Winterbottom
af7e0a05ca
Use partner name in page titles
12 年之前
David Winterbottom
66594ed6ba
Extend error message for primary_address
12 年之前
Maik Hoepfel
a319143b59
Add docstring and term 'product range' to glossary
Also adds a docstring to the is_discountable AbstractProduct
12 年之前
Maik Hoepfel
6aaee8dd74
Minor code style changes
We're not sure if a valid id might ever be 0. And using all() is a
little less verbose.
12 年之前
Maik Hoepfel
fc02b6d272
Clarify a few docstrings
12 年之前
Maik Hoepfel
5dcb5b6def
Save a query a day, keep the admin away
That custom get_object method almost worked. Now it does.
12 年之前
David Winterbottom
11da62fc1f
Pass the request to the shipping repository
Sometimes you need to use the session to determine the availability
shipping methods.
12 年之前
David Winterbottom
a88d5414e7
Add currency property to pricing policies
12 年之前
David Winterbottom
1054d75b62
Fix broken tests due to all_lines change
12 年之前
David Winterbottom
50267af4a3
Remove conflict marker (whoops!)
12 年之前
James Eddison
387298daf0
Update strategy.py
spelling corrected in comments
12 年之前
David Winterbottom
592d623e31
Assign strategy instance to basket (for offers)
12 年之前