Permalink
Browse files

Merge branch 'hotfix/googlecheckout_digital_noshipping_fix'

  • Loading branch information...
2 parents 5968295 + 35c018b commit 36f0572d9bb20db5735bce82f216ef7e85de3726 @chadj chadj committed Feb 17, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 hiicart/templates/gateway/google/cart.xml
@@ -11,7 +11,7 @@
<quantity>{{ lineitem.quantity }}</quantity>
<merchant-item-id>{{ lineitem.sku }}</merchant-item-id>
<unit-price currency="{{ currency }}">{{ lineitem.unit_price|floatformat:2 }}</unit-price>
- {% if lineitem.digital_description %}
+ {% if lineitem.digital_description and not cart.shipping %}
<digital-content>
<description>{{ lineitem.digital_description }}</description>
</digital-content>
@@ -44,7 +44,7 @@
<merchant-item-id>{{ lineitem.sku }}</merchant-item-id>
<unit-price currency="{{ currency }}">{{ lineitem.recurring_price|floatformat:2 }}</unit-price>
<merchant-private-item-data>{{ cart.cart_uuid }}</merchant-private-item-data>
- {% if lineitem.digital_description %}
+ {% if lineitem.digital_description and not cart.shipping %}
<digital-content>
<description>{{ lineitem.digital_description }}</description>
</digital-content>

0 comments on commit 36f0572

Please sign in to comment.