Merge pull request #547 from xzzy/master

Mooring RIA Version 2 Merge

.travis.yml

@@ -30,12 +30,14 @@ before_script:
     - psql -c 'create database travis_ci_test;' -U postgres
     - python manage_wl.py migrate --noinput
     - python manage_ps.py migrate --noinput
+    - python manage_mo.py migrate --noinput
     - python manage_wl.py load_ledger_fixtures
     - python manage_wl.py load_fixtures
 script:
     - COVERAGE_FILE=.coverage_ledger coverage run --source="." manage_wl.py test --noinput ledger
     - COVERAGE_FILE=.coverage_wl coverage run --source="." manage_wl.py test --noinput wildlifelicensing
     - COVERAGE_FILE=.coverage_ps coverage run --source="." manage_ps.py test --noinput parkstay
-    - coverage combine .coverage_ledger .coverage_wl .coverage_ps
+    - COVERAGE_FILE=.coverage_mo coverage run --source="." manage_mo.py test --noinput mooring
+    - coverage combine .coverage_ledger .coverage_wl .coverage_ps .coverage_mo
 after_success:
     - coveralls

ledger/checkout/utils.py

@@ -11,6 +11,7 @@
 from ledger.catalogue.models import Product
 from ledger.basket.models import Basket
 from ledger.basket.middleware import BasketMiddleware
+from django.core.signing import BadSignature, Signer
 
 Selector = get_class('partner.strategy', 'Selector')
 selector = Selector()
@@ -50,6 +51,20 @@ def create_basket_session(request, parameters):
     return basket, BasketMiddleware().get_basket_hash(basket.id)
 
 
+def get_cookie_basket(cookie_key,request):
+    basket = None
+    if cookie_key in request.COOKIES:
+       basket_hash = request.COOKIES[cookie_key]
+       try:
+           basket_id = Signer(sep='|').unsign(basket_hash)
+           basket = Basket.objects.get(pk=basket_id,
+                                      status=Basket.OPEN)
+       except (BadSignature, Basket.DoesNotExist):
+           request.cookies_to_delete.append(cookie_key)
+       return basket
+    return None
+
+
 # create a checkout session in Oscar.
 # the checkout session contains all of the attributes about a purchase session (e.g. payment method,
 # shipping method, ID of the person performing the checkout)
@@ -99,7 +114,6 @@ def place_order_submission(request):
     from ledger.checkout.views import PaymentDetailsView
     pdv = PaymentDetailsView(request=request, checkout_session=CheckoutSessionData(request))
     result = pdv.handle_place_order_submission(request)
-
     return result