From 3b3656aa9daf7af60d04a0114608a1420e8e0d6b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 1 Aug 2013 14:35:35 -0400 Subject: [PATCH] Bug 10402 [Template follow-up] Add multiple contacts for vendors This template-only follow-up tweaks the button labels and restructures the vendor view layout a little bit to make it more amenable to multiple contacts: - Add spaces after button icons - Change "Add contact" to "Add another contact" in hopes of making it less ambiguous whether clicking it will submit the whole form. - Eliminate duplicate headers on the vendor view page by making the contact name the subheading for each individual contact. To test, view details for vendors with one or more contacts, and try editing to add additional contacts. Everything should look good and work correctly. Signed-off-by: Jared Camins-Esakov Signed-off-by: Paola Rossi Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/acqui/supplier.tt | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 549ea49685..420214f8fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -16,11 +16,12 @@
  • - [% IF contact.id %]
  • [% END %] + [% IF contact.id %]
  • [% END %] [% END %] + [% BLOCK show_contact %] -

    Contact name: [% contact.name %]

    +

    [% contact.name %]

    Position: [% contact.position %]

    Phone: [% contact.phone %]

    Alternative phone: [% contact.altphone %]

    @@ -32,6 +33,7 @@

    Notes: [% contact.notes %]

    [% END %] [% END %] + [% INCLUDE 'doc-head-open.inc' %] Koha › Vendor [% bookselname %] @@ -132,7 +134,7 @@ function delete_contact() { [% INCLUDE edit_contact %] [% END %] - +
    @@ -242,41 +244,45 @@ function delete_contact() { [% IF ( accountnumber ) %]

    Account number: [% accountnumber %]

    [% END %] + +
    +

    Ordering information

    +

    Vendor is: + [% IF ( active ) %] + Active + [% ELSE %] + Inactive + [% END %]

    +

    List prices are: [% listprice %]

    +

    Invoice prices are: [% invoiceprice %]

    + [% IF ( gstrate ) %]

    Tax number registered: + [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]

    +

    List item price includes tax: + [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]

    +

    Invoice item price includes tax: + [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]

    [% END %] +

    Discount: + [% discount | format("%.1f") %] %

    +

    Tax rate: + [% 0 + gstrate * 100 | format("%.1f") %] %

    + [% IF deliverytime.defined %] +

    Delivery time: + [% deliverytime %] days

    + [% END %] + [% IF ( notes ) %]

    Notes: + [% notes %]

    [% END %]
    - [% FOREACH contact IN contacts %] -
    -

    Contact details

    +
    + +
    +

    Contact

    + [% FOREACH contact IN contacts %] [% INCLUDE show_contact %] -
    - [% END %] -
    -
    -

    Ordering information

    -

    Vendor is: - [% IF ( active ) %] - Active - [% ELSE %] - Inactive - [% END %]

    -

    List prices are: [% listprice %]

    -

    Invoice prices are: [% invoiceprice %]

    - [% IF ( gstrate ) %]

    Tax number registered: - [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]

    -

    List item price includes tax: - [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]

    -

    Invoice item price includes tax: - [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]

    [% END %] -

    Discount: - [% discount | format("%.1f") %] %

    -

    Tax rate: - [% 0 + gstrate * 100 | format("%.1f") %] %

    - [% IF deliverytime.defined %] -

    Delivery time: - [% deliverytime %] days

    - [% END %] - [% IF ( notes ) %]

    Notes: - [% notes %]

    [% END %] + [% END %] +
    + + [% IF ( contracts ) %]

    Contract(s)

    -- 2.39.5