fix post paypal routines (mostly urls)

diff --git a/app/diggersdigest/settings.py b/app/diggersdigest/settings.py
index e57a911110fb43d926d92bcef947f28a9a80d239..222327488a0b30ed45568a270e3aa441edc01c21 100644 (file)
--- a/app/diggersdigest/settings.py
+++ b/app/diggersdigest/settings.py
@@ -119,7 +119,7 @@ SEARCH_MODEL_CHOICES = ('shop.Product',)
 
 # If True, the checkout process is split into separate
 # billing/shipping and payment steps.
-SHOP_CHECKOUT_STEPS_SPLIT = False
+SHOP_CHECKOUT_STEPS_SPLIT = True
 
 # If True, the checkout process has a final confirmation step before
 # completion.
@@ -243,7 +243,7 @@ USE_TZ = True
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = "fr"
+LANGUAGE_CODE = "en"
 
 # Supported languages
 LANGUAGES = (

diff --git a/app/diggersdigest/urls.py b/app/diggersdigest/urls.py
index 6efe25e5579128a2a7dbe70eb40ee8a073557f4a..735d83c8f6901e5599fc0d4688ad9eaf74e751df 100644 (file)
--- a/app/diggersdigest/urls.py
+++ b/app/diggersdigest/urls.py
@@ -27,6 +27,8 @@ if settings.USE_MODELTRANSLATION:
 
 urlpatterns += patterns('',
 
+    (r'^paypal-ipn-8c5erc9ye49ia51rn655mi4xs8/', include('paypal.standard.ipn.urls')),
+
     # Cartridge URLs.
     ("^shop/", include("cartridge.shop.urls")),
     url("^account/orders/$", "cartridge.shop.views.order_history",
@@ -100,9 +102,6 @@ urlpatterns += patterns('',
     # need to use the ``SITE_PREFIX`` setting as well.
 
     # ("^%s/" % settings.SITE_PREFIX, include("mezzanine.urls"))
-
-    (r'^paypal-ipn-8c5erc9ye49ia51rn655mi4xs7/', include('paypal.standard.ipn.urls')),
-
 )
 
 # Adds ``STATIC_URL`` to the context of error pages, so that error

diff --git a/app/records/models.py b/app/records/models.py
index 68b9ab3ebab315eab1d7c94c90101bc403d102db..70351952ab9266d77b28a13bf2ff083bc644f77b 100644 (file)
--- a/app/records/models.py
+++ b/app/records/models.py
@@ -19,6 +19,7 @@ from mezzanine.utils.models import upload_to
 
 from cartridge.shop.models import Product, Category, Cart, Order, ProductVariation, DiscountCode
 from paypal.standard.ipn.signals import payment_was_successful
+from paypal.standard.ipn.signals import valid_ipn_received
 
 
 # Auto-generated Django models with manage.py inspectdb on the old database
@@ -345,4 +346,5 @@ def payment_complete(sender, **kwargs):
         except Cart.DoesNotExist:
             pass
 
-payment_was_successful.connect(payment_complete)
+#payment_was_isuccessful.connect(payment_complete)
+valid_ipn_received.connect(payment_complete)

diff --git a/app/templates/shop/product.html b/app/templates/shop/product.html
index 047210aa848978695b4fdcf7e3622348821e83af..c53f67414bc5178772aa6f61cd33cd5f22a64330 100644 (file)
--- a/app/templates/shop/product.html
+++ b/app/templates/shop/product.html
@@ -148,13 +148,11 @@ $(function () {
 </div>
 </div>
 
-{% comment %}
 <div class="description">
 {% editable product.content %}
 {{ product.content|richtext_filters|safe }}
 {% endeditable %}
 </div>
-{% endcomment %}
 
 {% if product.available and has_available_variations and product.price %}