View | Details | Raw Unified | Return to bug 13618
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-16 / +20 lines)
Lines 494-504 Link Here
494
494
495
[% END %]
495
[% END %]
496
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
496
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
497
    [% IF Koha.Preference( 'AddressFormat' ) %]
497
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
498
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
498
        [% CASE 'de' %]
499
    [% ELSE %]
499
            [% INCLUDE 'member-main-address-style-de.inc' %]
500
        [% INCLUDE 'member-main-address-style-us.inc' %]
500
        [% CASE # us %]
501
    [% END %]
501
            [% INCLUDE 'member-main-address-style-us.inc' %]
502
     [% END %]
502
[% END # nostreet && nocity etc group%]
503
[% END # nostreet && nocity etc group%]
503
504
504
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
505
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
Lines 587-606 Link Here
587
[% IF ( step_6 ) %]
588
[% IF ( step_6 ) %]
588
589
589
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
590
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
590
        [% IF Koha.Preference( 'AddressFormat' ) %]
591
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
591
            [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
592
        [% CASE 'de' %]
592
        [% ELSE %]
593
            [% INCLUDE 'member-main-address-style-de.inc' %]
593
            [% INCLUDE 'member-alt-address-style-us.inc' %]
594
        [% CASE # us %]
594
        [% END %]
595
            [% INCLUDE 'member-main-address-style-us.inc' %]
596
     [% END %]
597
595
    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
598
    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
596
[% END %]
599
[% END %]
597
[% IF ( step_2 ) %]
600
[% IF ( step_2 ) %]
598
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
601
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
599
        [% IF Koha.Preference( 'AddressFormat' ) %]
602
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
600
            [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
603
        [% CASE 'de' %]
601
        [% ELSE %]
604
            [% INCLUDE 'member-main-address-style-de.inc' %]
602
            [% INCLUDE 'member-alt-contact-style-us.inc' %]
605
        [% CASE # us %]
603
        [% END %]
606
            [% INCLUDE 'member-main-address-style-us.inc' %]
607
     [% END %]
608
    
604
    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
609
    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
605
610
606
[% END %]
611
[% END %]
607
- 

Return to bug 13618