X-Git-Url: https://scm.cri.ensmp.fr/git/photoprint.git/blobdiff_plain/bddfc31eaf67003a04f79f7cf168b8d840920fd6..1c64d06aeb63ed19c799e296996d012067b3990e:/skins/order_view_template.pt?ds=inline

diff --git a/skins/order_view_template.pt b/skins/order_view_template.pt
index f5876b7..96c984a 100644
--- a/skins/order_view_template.pt
+++ b/skins/order_view_template.pt
@@ -75,8 +75,7 @@
             </table>
           </td>
           <td>
-            <img tal:define="translate nocall:modules/Products/photoprint/utils/translate;
-                             tr python:lambda msg: translate(msg, here)"
+            <img tal:define="tr nocall:modules/Products/photoprint/utils/translate"
                  tal:attributes="src python:'%s/order_states/%s' % (portal_url, tr('%s-en.gif' % options['wfstate']))"
                  style="float:right"/>
           </td>
@@ -130,6 +129,10 @@
             <th class="num" tal:content="python:'%s €' % options['pricesSum'].taxed"
                 style="border-right:1px solid black"></th>
           </tr>
+          <tr tal:condition="options/discount">
+            <td class="num" colspan="5" i18n:translate="">Discount</td>
+            <td class="num"><span tal:replace="options/discount"/> %</td>
+          </tr>
           <tr>
             <td class="num" colspan="5" i18n:translate="">Shipping</td>
             <td class="num" tal:content="python:'%s €' % options['shippingFees'].taxed"></td>
@@ -145,38 +148,30 @@
           </tr>
         </tbody>
         <tfoot>
-          <tr tal:define="paymentRequest options/paymentRequest|nothing" tal:condition="paymentRequest">
+          <tr tal:define="checkout options/checkout|nothing" tal:condition="checkout">
             <td><br/></td>
             <td colspan="5">
               <div style="text-align:right">
-                <form tal:attributes="action paymentRequest/URL" method="post" style="text-align:top">
-                  <input type="hidden" name="DATA" tal:attributes="value paymentRequest/DATA"/>
-                  <span i18n:translate="" style="font-size:110%;font-weight:bold;vertical-align:middle">Use one of these button to pay:</span>
-                  <span tal:repeat="mean paymentRequest/PAYMENT_MEANS">
-                    <input type="image" style="vertical-align:middle"
-                      tal:attributes="src python:'%s/cyberplus_logo/%s.gif' % (portal_url, mean);
-                                      name mean"/>    
-                  </span>
-                  <input type="hidden" name="noAjax" value="1"/>
-                </form>
-              </div>
-              <div>
-                <img tal:attributes="src string:$portal_url/cyberplus_logo/banque_populaire_logo.png"
-                     style="float:left;margin-right:1em"/>
-                <dl class="FieldHelp">
-                  <dd i18n:translate="">
-                    Please click over the button representing your credit card.
-                    You will leave temporarily this web site to pay your order
-                    on our bank partner payment site. After your payment, you
-                    will be able to come back to the store and get an invoice of
-                    your transaction.
-                  </dd>
-                  <dd i18n:translate="">
-                    This secured payment is provided by the Cyberplus™ payment
-                    service of "Banque Populaire".
-                  </dd>
-                </dl>
+                <span i18n:translate="" tal:omit-tag="">Pay with PayPal:</span>
+                <a href="#" tal:attributes="href checkout/url"
+                   title="Pay with PayPal" i18n:attributes="title">
+                  <img tal:attributes="src string:$portal_url/paypal-button.png"
+                       width="72" height="45" style="vertical-align:middle"
+                       alt="Pay with PayPal" i18n:attributes="alt"/>
+                </a>
               </div>
+              <p i18n:translate="">
+                Please check the preceding table and proceed to payment. By
+                clicking on the PayPal button, you will temporarily leave the
+                site: you will be redirected to the payment provider PayPal.
+                Please follow given instructions. The transaction will be final
+                as soon as you are back on the <em i18n:name="site_name"
+                tal:content="portal_object/Title">portal title</em> site. For
+                your information, there is no need to create a PayPal account,
+                even if you will be prompted: you can simply use your credit
+                card. If you already have a PayPal account, you can, at your
+                convenience, pay by PayPal transfer or by credit card.
+              </p>
             </td>
           </tr>
         </tfoot>
@@ -195,7 +190,6 @@
 	        <tr tal:define="oddrow repeat/item/odd" tal:attributes="class python:test(oddrow, 'even', 'odd')"
 	        		tal:condition="item/action">
 	        	<td tal:content="python:item['time'].strftime(locale_date_fmt)">time</td>
-	        	<td tal:condition="python:item['action'].startswith('auto_')">Cyberplus</td>
 	        	<td tal:condition="python:not item['action'].startswith('auto_')"
 	        	    tal:content="python:mtool.getMemberFullNameById(item['actor'], nameBefore=0)">actor</td>
             <td tal:content="item/action" i18n:translate=""></td>