Johannes Bornhold avatar Johannes Bornhold committed a57a981 Merge

merge

Comments (0)

Files changed (2)

satchmo/apps/payment/modules/giftcertificate/models.py

 from payment.utils import get_processor_by_key
 from product.models import Product
 from satchmo_store.contact.models import Contact
-from satchmo_store.shop.models import OrderPayment, Order
+from satchmo_store.shop.models import Order
 import logging
 
 GIFTCODE_KEY = 'GIFTCODE'
     notes = models.TextField(_('Notes'), blank=True, null=True)
     balance_used = models.DecimalField(_("Amount Used"), decimal_places=2,
         max_digits=8, )
-    orderpayment = models.ForeignKey(OrderPayment, null=True, verbose_name=_('Order Payment'))
+    orderpayment = models.ForeignKey('shop.OrderPayment', null=True, verbose_name=_('Order Payment'))
     used_by = models.ForeignKey(Contact, verbose_name=_('Used by'),
         blank=True, null=True, related_name='giftcertificates_used')
     giftcertificate = models.ForeignKey(GiftCertificate, related_name='usages')

satchmo/apps/payment/templates/shop/checkout/paypal/confirm.html

     {% endif %}
   {% endif %}
 {% else %}
-  {# no discount %}
+  {# no discount #}
   <input type="hidden" name="item_name_{{forloop.counter}}" value="{{item}}" />
   <input type="hidden" name="amount_{{forloop.counter}}" value="{{item.unit_price|truncate_decimal:2}}" />
 {% endif %}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.