Implémentation de la remise.

[photoprint.git] / skins / order_view_template.pt

diff --git a/skins/order_view_template.pt b/skins/order_view_template.pt
index f3ba7d1..96e6c4a 100644 (file)
--- a/skins/order_view_template.pt
+++ b/skins/order_view_template.pt
@@ -75,8 +75,7 @@
             </table>
           </td>
           <td>
             </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>
                  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>
             <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>
           <tr>
             <td class="num" colspan="5" i18n:translate="">Shipping</td>
             <td class="num" tal:content="python:'%s €' % options['shippingFees'].taxed"></td>


@@ -187,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>
                <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>
                        <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>