maniaquerie

[photoprint.git] / skins / order_view.py

diff --git a/skins/order_view.py b/skins/order_view.py
index 5ed50bf..1930d31 100755 (executable)
--- a/skins/order_view.py
+++ b/skins/order_view.py
@@ -20,8 +20,7 @@ options['wfhistory'] = wtool.getInfoFor(context, 'review_history', 'order_workfl
 toBePaid = wfstate == 'recorded'
 
 if toBePaid :
 toBePaid = wfstate == 'recorded'
 
 if toBePaid :

-       paymentRequest = context.getPaymentRequest()
-       options['paymentRequest'] = paymentRequest
+    options['checkout'] = context.ppSetExpressCheckout()

 
 if cart.locked and \
        cart.pendingOrderPath == context.getPhysicalPath() :
 
 if cart.locked and \
        cart.pendingOrderPath == context.getPhysicalPath() :


@@ -56,6 +55,7 @@ for item in context.items :
 options['infos'] = infos
 options['quantity'] = quantity
 options['pricesSum'] = context.price
 options['infos'] = infos
 options['quantity'] = quantity
 options['pricesSum'] = context.price

+options['discount'] = getattr(context, 'discount', 0)

 options['shippingFees'] = shippingFees = context.shippingFees
 options['total'] = context.amountWithFees
 
 options['shippingFees'] = shippingFees = context.shippingFees
 options['total'] = context.amountWithFees