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.

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

Support Oscar 0.6 #34

Merged
merged 12 commits into from
Dec 19, 2013
Merged

Support Oscar 0.6 #34

merged 12 commits into from
Dec 19, 2013

Conversation

codeinthehole
Copy link
Contributor

This a WIP branch to track progress on supporting Oscar 0.6. It will be finished off and released when Oscar 0.6 is released.

  • Remove dependency on oscar_testsupport
  • Ensure frozen basket (in Express success view) has a strategy instance assigned

codeinthehole and others added 4 commits August 13, 2013 12:14
- Only check for shipping address when basket indicates that one would
  be required.
@madEng84
Copy link

madEng84 commented Nov 6, 2013

I see an other poroblem
get_shipping_method() takes at most 2 arguments (3 given)

You can replace

  • def get_shipping_method(self, basket):
  • def get_shipping_method(self, basket, shipping_address=None, **kwargs):

Then, however, i have this error:
https://groups.google.com/forum/#!topic/django-oscar/w9t-TyOUnXA

Conflicts:
	paypal/express/gateway.py
	paypal/express/views.py
- Pass basket to get_shipping_address
- Pass basket to get_shipping_method
- Ensure strategies are assigned to reloaded frozen baskets
- Use a build_submission method
- Pass both values to FixedPrice shipping method
- Use renamed bankcard attributes in tests
The folders are required so the image_not_found image can be
automatically created.
@codeinthehole
Copy link
Contributor Author

I've fixed the issues arising from changing APIs in Oscar 0.6. Tests are passing and everything seems to be working.

I still need to test some US scenarios where tax isn't known in advance.

except Basket.DoesNotExist:
messages.error(
self.request,
_("No basket was found that corresponds to your "
"PayPal transaction"))
return HttpResponseRedirect(reverse('basket:summary'))
else:
# Assign strategy to basket instance
basket.strategy = Selector().strategy(self.request)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oscar 0.4 & 0.5 don't have selector class

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need it to determine any basket line prices or totals.

We'll probably need to stop supporting 0.4 and 0.5 for the next release.

codeinthehole added a commit that referenced this pull request Dec 19, 2013
@codeinthehole codeinthehole merged commit 7265275 into master Dec 19, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants