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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-14 / +18 lines)
Lines 510-520 Link Here
510
510
511
[% END %]
511
[% END %]
512
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
512
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
513
    [% IF Koha.Preference( 'AddressFormat' ) %]
513
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
514
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
514
        [% CASE 'de' %]
515
    [% ELSE %]
515
            [% INCLUDE 'member-main-address-style-de.inc' %]
516
        [% INCLUDE 'member-main-address-style-us.inc' %]
516
        [% CASE # us %]
517
    [% END %]
517
            [% INCLUDE 'member-main-address-style-us.inc' %]
518
     [% END %]
518
[% END # nostreet && nocity etc group%]
519
[% END # nostreet && nocity etc group%]
519
520
520
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
521
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
Lines 603-622 Link Here
603
[% IF ( step_6 ) %]
604
[% IF ( step_6 ) %]
604
605
605
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
606
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
606
        [% IF Koha.Preference( 'AddressFormat' ) %]
607
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
607
            [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
608
        [% CASE 'de' %]
608
        [% ELSE %]
609
            [% INCLUDE 'member-alt-address-style-de.inc' %]
610
        [% CASE # us %]
609
            [% INCLUDE 'member-alt-address-style-us.inc' %]
611
            [% INCLUDE 'member-alt-address-style-us.inc' %]
610
        [% END %]
612
     [% END %]
613
611
    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
614
    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
612
[% END %]
615
[% END %]
613
[% IF ( step_2 ) %]
616
[% IF ( step_2 ) %]
614
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
617
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
615
        [% IF Koha.Preference( 'AddressFormat' ) %]
618
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
616
            [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
619
        [% CASE 'de' %]
617
        [% ELSE %]
620
            [% INCLUDE 'member-alt-contact-style-de.inc' %]
621
        [% CASE # us %]
618
            [% INCLUDE 'member-alt-contact-style-us.inc' %]
622
            [% INCLUDE 'member-alt-contact-style-us.inc' %]
619
        [% END %]
623
     [% END %]
624
    
620
    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
625
    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
621
626
622
[% END %]
627
[% END %]
623
- 

Return to bug 13618