WordPress.org
Get WordPress

Plugin Directory

Changeset 2513894


Ignore:
Timestamp:
04/13/2021 08:18:38 AM (5 years ago)
Author:
karlogitlea
Message:

Fixed error

Location:
miqid-core/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • miqid-core/trunk/languages/miqid-core-da_DK.po

    r2513169 r2513894  
    44"Report-Msgid-Bugs-To: \n"
    55"POT-Creation-Date: 2020-10-22 08:20+0000\n"
    6 "PO-Revision-Date: 2021-03-17 14:55+0000\n"
     6"PO-Revision-Date: 2021-04-13 08:03+0000\n"
    77"Last-Translator: \n"
    88"Language-Team: Dansk\n"
    … …  
    1515"X-Loco-Version: 2.5.0; wp-5.6"
    1616
    17 #: src/Classes/DTO/Address.php:44
    18 msgid "Address"
    19 msgstr "Adresse"
    20 
    21 #: src/Classes/DTO/Address.php:53
    22 #| msgid "city"
    23 msgid "City"
    24 msgstr "By"
     17#: src/Classes/DTO/Enum/BiometricsPermission.php:16
     18msgctxt "BiometricsPermission"
     19msgid "UseBiometricsToApprove"
     20msgstr ""
     21
     22#: src/Classes/DTO/Enum/BiometricsPermission.php:17
     23msgctxt "BiometricsPermission"
     24msgid "UseBiometricsToRecover"
     25msgstr ""
    2526
    2627#. "switch off" means to temporarily log out
    … …  
    3536msgstr ""
    3637
    37 #: src/Classes/DTO/Profile.php:43 src/Classes/DTO/Address.php:51
    38 #| msgid "country"
    39 msgid "Country"
    40 msgstr "Land"
    41 
    42 #: src/Admin/Init.php:165
     38#: src/Classes/DTO/Profile.php:42
     39msgid "CprNumber"
     40msgstr "CPR-nr."
     41
     42#: src/Admin/Init.php:284
    4343msgid "Date Format"
    4444msgstr ""
    4545
    46 #: src/Classes/DTO/Profile.php:40
     46#: src/Classes/DTO/Profile.php:41
    4747#| msgid "dateOfBirth"
    4848msgid "DateOfBirth"
    4949msgstr "Fødselsdato"
    5050
    51 #: src/Admin/Init.php:189
     51#: src/Admin/Init.php:308
    5252msgid "DateTime Format"
    5353msgstr ""
    5454
    55 #: src/Frontend/WP_Login.php:104 src/Classes/DTO/Profile.php:36
    56 #: src/Classes/DTO/Address.php:55
     55#: src/Frontend/WP_Login.php:103 src/Classes/DTO/Profile.php:37
    5756msgid "Email"
    5857msgstr "E-mail"
    5958
    60 #: src/Classes/DTO/Profile.php:37
     59#: src/Admin/Init.php:253
     60msgid "Endpoint Business Host"
     61msgstr ""
     62
     63#: src/Admin/Init.php:263
     64msgid "Endpoint Business Version"
     65msgstr ""
     66
     67#: src/Admin/Init.php:243
     68msgid "Endpoint Private Host"
     69msgstr ""
     70
     71#: src/Classes/DTO/Profile.php:38
    6172#| msgid "firstName"
    6273msgid "FirstName"
    … …  
    6778msgstr ""
    6879
    69 #: src/Admin/Init.php:155
     80#: src/Admin/Init.php:274
    7081msgid "JWT Token"
    7182msgstr ""
    7283
    73 #: src/Classes/DTO/Profile.php:38
     84#: src/Classes/DTO/Profile.php:39
    7485#| msgid "lastName"
    7586msgid "LastName"
    7687msgstr "Efternavn"
    7788
    78 #: src/Classes/DTO/Profile.php:39
     89#: src/Classes/DTO/Profile.php:40
    7990msgid "LegalName"
    80 msgstr ""
    81 
    82 #: src/Admin/Init.php:98
    83 msgid "Makes a login form that you can place where on the page you want."
    84 msgstr ""
    85 "Laver en login formular som man kan ligge hvor henne på siden man har lyst "
    86 "til."
     91msgstr "Juridisk navn"
    8792
    8893#. Author of the plugin
    … …  
    98103msgstr ""
    99104
    100 #: src/Classes/DTO/Profile.php:44
     105#: src/Classes/DTO/Profile.php:45
    101106#| msgid "nationality"
    102107msgid "Nationality"
    103108msgstr "Nationalitet"
    104109
    105 #: src/Frontend/Filter/Profile.php:96
    106 msgid "Not verified"
    107 msgstr "Ikke bekræftet"
    108 
    109 #: src/Frontend/WP_Login.php:109
     110#: src/Frontend/Shortcode/Shortcode.php:86
     111#, php-format
     112msgid "Not %s"
     113msgstr "Ikke %s"
     114
     115#: src/Frontend/WP_Login.php:108
    110116msgid "Password"
    111117msgstr "Adgangskode"
    112118
    113 #: src/Classes/DTO/Profile.php:42 src/Classes/DTO/Address.php:54
     119#: src/Classes/DTO/Enum/PermissionType.php:18
     120msgctxt "PermissionType"
     121msgid "Authority"
     122msgstr ""
     123"Myndighed\n"
     124
     125#: src/Frontend/Shortcode/Shortcode.php:159
     126#, php-format
     127msgctxt "PermissionType"
     128msgid "Data not shared with %s in MIQID."
     129msgstr "Data ikke delt med %s i MIQID."
     130
     131#: src/Classes/DTO/Enum/PermissionType.php:20
     132msgctxt "PermissionType"
     133msgid "Private"
     134msgstr "Privat"
     135
     136#: src/Classes/DTO/Enum/PermissionType.php:19
     137msgctxt "PermissionType"
     138msgid "Shopping"
     139msgstr "Handel"
     140
     141#: src/Classes/DTO/Profile.php:44
    114142#| msgid "phoneNumber"
    115143msgid "PhoneNumber"
    116144msgstr "Telefon nr."
    117145
    118 #: src/Classes/DTO/Address.php:52
    119 msgid "PostalCode"
    120 msgstr "Postnummer"
    121 
    122 #: src/Classes/DTO/Profile.php:35
     146#: src/Classes/DTO/Profile.php:36
    123147msgid "Profile"
    124148msgstr "Profil"
    125149
    126 #: src/Classes/DTO/Profile.php:41
     150#: src/Classes/DTO/Profile.php:43
    127151msgid "SexType"
    128152msgstr "Køn"
    129153
    130 #: src/Classes/DTO/SexType.php:17
     154#: src/Classes/DTO/Enum/SexType.php:18
    131155msgctxt "SexType"
    132156msgid "Female"
    133157msgstr "Kvinde"
    134158
    135 #: src/Classes/DTO/SexType.php:16
     159#: src/Classes/DTO/Enum/SexType.php:17
    136160msgctxt "SexType"
    137161msgid "Male"
    138162msgstr "Mand"
    139163
    140 #: src/Classes/DTO/SexType.php:18
     164#: src/Classes/DTO/Enum/SexType.php:19
    141165msgctxt "SexType"
    142166msgid "Other"
    143167msgstr "Andet"
    144 
    145 #: src/Classes/DTO/Address.php:47
    146 msgid "SideDoorFloor"
    147 msgstr "Side Dør Etage"
    148 
    149 #: src/Classes/DTO/Address.php:50
    150 msgid "SideDoorFloor2"
    151 msgstr ""
    152 
    153 #: src/Classes/DTO/Address.php:45
    154 msgid "Street"
    155 msgstr "Vejnavn"
    156 
    157 #: src/Classes/DTO/Address.php:48
    158 msgid "Street2"
    159 msgstr ""
    160 
    161 #: src/Classes/DTO/Address.php:46
    162 msgid "StreetNumber"
    163 msgstr "Vejnummer"
    164 
    165 #: src/Classes/DTO/Address.php:49
    166 msgid "StreetNumber2"
    167 msgstr ""
    168168
    169169#. 1: user display name; 2: username;
    … …  
    189189msgstr ""
    190190
    191 #: src/Admin/Init.php:177
     191#: src/Classes/DTO/Enum/Theme.php:15
     192msgctxt "Theme"
     193msgid "Dark"
     194msgstr ""
     195
     196#: src/Classes/DTO/Enum/Theme.php:16
     197msgctxt "Theme"
     198msgid "Light"
     199msgstr ""
     200
     201#: src/Admin/Init.php:296
    192202msgid "Time Format"
    193203msgstr ""
    194204
    195 #: src/Admin/Init.php:201
     205#: src/Admin/Init.php:320
    196206msgid "User Switching Enabled"
    197207msgstr ""
    … …  
    202212msgstr ""
    203213
    204 #: src/Frontend/Filter/Profile.php:96 src/Classes/DTO/Profile.php:45
     214#: src/Classes/DTO/Profile.php:46
    205215msgid "Verified"
    206216msgstr "Bekræftet "

  • miqid-core/trunk/languages/miqid-core.pot

    r2513169 r2513894  
    44"Project-Id-Version: MIQID-Core\n"
    55"Report-Msgid-Bugs-To: \n"
    6 "POT-Creation-Date: 2021-03-17 14:55+0000\n"
     6"POT-Creation-Date: 2021-04-13 08:01+0000\n"
    77"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    88"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1616"X-Loco-Version: 2.4.3; wp-5.5.1"
    1717
    18 #: src/Classes/DTO/Address.php:44
    19 msgid "Address"
    20 msgstr ""
    21 
    22 #: src/Classes/DTO/Address.php:53
    23 msgid "City"
     18#: src/Classes/DTO/Enum/BiometricsPermission.php:16
     19msgctxt "BiometricsPermission"
     20msgid "UseBiometricsToApprove"
     21msgstr ""
     22
     23#: src/Classes/DTO/Enum/BiometricsPermission.php:17
     24msgctxt "BiometricsPermission"
     25msgid "UseBiometricsToRecover"
    2426msgstr ""
    2527
    … …  
    3537msgstr ""
    3638
    37 #: src/Classes/DTO/Profile.php:43 src/Classes/DTO/Address.php:51
    38 msgid "Country"
    39 msgstr ""
    40 
    41 #: src/Admin/Init.php:165
     39#: src/Classes/DTO/Profile.php:42
     40msgid "CprNumber"
     41msgstr ""
     42
     43#: src/Admin/Init.php:284
    4244msgid "Date Format"
    4345msgstr ""
    4446
    45 #: src/Classes/DTO/Profile.php:40
     47#: src/Classes/DTO/Profile.php:41
    4648msgid "DateOfBirth"
    4749msgstr ""
    4850
    49 #: src/Admin/Init.php:189
     51#: src/Admin/Init.php:308
    5052msgid "DateTime Format"
    5153msgstr ""
    5254
    53 #: src/Frontend/WP_Login.php:104 src/Classes/DTO/Profile.php:36
    54 #: src/Classes/DTO/Address.php:55
     55#: src/Frontend/WP_Login.php:103 src/Classes/DTO/Profile.php:37
    5556msgid "Email"
    5657msgstr ""
    5758
    58 #: src/Classes/DTO/Profile.php:37
     59#: src/Admin/Init.php:253
     60msgid "Endpoint Business Host"
     61msgstr ""
     62
     63#: src/Admin/Init.php:263
     64msgid "Endpoint Business Version"
     65msgstr ""
     66
     67#: src/Admin/Init.php:243
     68msgid "Endpoint Private Host"
     69msgstr ""
     70
     71#: src/Classes/DTO/Profile.php:38
    5972msgid "FirstName"
    6073msgstr ""
    … …  
    6477msgstr ""
    6578
    66 #: src/Admin/Init.php:155
     79#: src/Admin/Init.php:274
    6780msgid "JWT Token"
    6881msgstr ""
    6982
    70 #: src/Classes/DTO/Profile.php:38
     83#: src/Classes/DTO/Profile.php:39
    7184msgid "LastName"
    7285msgstr ""
    7386
    74 #: src/Classes/DTO/Profile.php:39
     87#: src/Classes/DTO/Profile.php:40
    7588msgid "LegalName"
    76 msgstr ""
    77 
    78 #: src/Admin/Init.php:98
    79 msgid "Makes a login form that you can place where on the page you want."
    8089msgstr ""
    8190
    … …  
    92101msgstr ""
    93102
     103#: src/Classes/DTO/Profile.php:45
     104msgid "Nationality"
     105msgstr ""
     106
     107#: src/Frontend/Shortcode/Shortcode.php:86
     108#, php-format
     109msgid "Not %s"
     110msgstr ""
     111
     112#: src/Frontend/WP_Login.php:108
     113msgid "Password"
     114msgstr ""
     115
     116#: src/Classes/DTO/Enum/PermissionType.php:18
     117msgctxt "PermissionType"
     118msgid "Authority"
     119msgstr ""
     120
     121#: src/Frontend/Shortcode/Shortcode.php:159
     122#, php-format
     123msgctxt "PermissionType"
     124msgid "Data not shared with %s in MIQID."
     125msgstr ""
     126
     127#: src/Classes/DTO/Enum/PermissionType.php:20
     128msgctxt "PermissionType"
     129msgid "Private"
     130msgstr ""
     131
     132#: src/Classes/DTO/Enum/PermissionType.php:19
     133msgctxt "PermissionType"
     134msgid "Shopping"
     135msgstr ""
     136
    94137#: src/Classes/DTO/Profile.php:44
    95 msgid "Nationality"
    96 msgstr ""
    97 
    98 #: src/Frontend/Filter/Profile.php:96
    99 msgid "Not verified"
    100 msgstr ""
    101 
    102 #: src/Frontend/WP_Login.php:109
    103 msgid "Password"
    104 msgstr ""
    105 
    106 #: src/Classes/DTO/Profile.php:42 src/Classes/DTO/Address.php:54
    107138msgid "PhoneNumber"
    108139msgstr ""
    109140
    110 #: src/Classes/DTO/Address.php:52
    111 msgid "PostalCode"
    112 msgstr ""
    113 
    114 #: src/Classes/DTO/Profile.php:35
     141#: src/Classes/DTO/Profile.php:36
    115142msgid "Profile"
    116143msgstr ""
    117144
    118 #: src/Classes/DTO/Profile.php:41
     145#: src/Classes/DTO/Profile.php:43
    119146msgid "SexType"
    120147msgstr ""
    121148
    122 #: src/Classes/DTO/SexType.php:17
     149#: src/Classes/DTO/Enum/SexType.php:18
    123150msgctxt "SexType"
    124151msgid "Female"
    125152msgstr ""
    126153
    127 #: src/Classes/DTO/SexType.php:16
     154#: src/Classes/DTO/Enum/SexType.php:17
    128155msgctxt "SexType"
    129156msgid "Male"
    130157msgstr ""
    131158
    132 #: src/Classes/DTO/SexType.php:18
     159#: src/Classes/DTO/Enum/SexType.php:19
    133160msgctxt "SexType"
    134161msgid "Other"
    135 msgstr ""
    136 
    137 #: src/Classes/DTO/Address.php:47
    138 msgid "SideDoorFloor"
    139 msgstr ""
    140 
    141 #: src/Classes/DTO/Address.php:50
    142 msgid "SideDoorFloor2"
    143 msgstr ""
    144 
    145 #: src/Classes/DTO/Address.php:45
    146 msgid "Street"
    147 msgstr ""
    148 
    149 #: src/Classes/DTO/Address.php:48
    150 msgid "Street2"
    151 msgstr ""
    152 
    153 #: src/Classes/DTO/Address.php:46
    154 msgid "StreetNumber"
    155 msgstr ""
    156 
    157 #: src/Classes/DTO/Address.php:49
    158 msgid "StreetNumber2"
    159162msgstr ""
    160163
    … …  
    181184msgstr ""
    182185
    183 #: src/Admin/Init.php:177
     186#: src/Classes/DTO/Enum/Theme.php:15
     187msgctxt "Theme"
     188msgid "Dark"
     189msgstr ""
     190
     191#: src/Classes/DTO/Enum/Theme.php:16
     192msgctxt "Theme"
     193msgid "Light"
     194msgstr ""
     195
     196#: src/Admin/Init.php:296
    184197msgid "Time Format"
    185198msgstr ""
    186199
    187 #: src/Admin/Init.php:201
     200#: src/Admin/Init.php:320
    188201msgid "User Switching Enabled"
    189202msgstr ""
    … …  
    194207msgstr ""
    195208
    196 #: src/Frontend/Filter/Profile.php:96 src/Classes/DTO/Profile.php:45
     209#: src/Classes/DTO/Profile.php:46
    197210msgid "Verified"
    198211msgstr ""

  • miqid-core/trunk/miqid-core.php

    r2513371 r2513894  
    33 * Plugin Name:       MIQID-Core
    44 * Description:       MIQID-Core handle the basics.
    5  * Version:           1.7.4
     5 * Version:           1.7.5
    66 * Requires at least: 5.2
    77 * Requires PHP:      7.2

  • miqid-core/trunk/readme.md

    r2513371 r2513894  
    44Tested up to: 5.7
    55Requires PHP: 7.2 
    6 Stable tag: 1.7.4 
     6Stable tag: 1.7.5 
    77License: GPL v3 or later 
    88

  • miqid-core/trunk/src/Frontend/Shortcode/Shortcode.php

    r2513270 r2513894  
    44
    55use DateTime;
    6 use MIQID\Plugin\Core\Frontend\Shortcode\Business\{
    7     Certificate as Certificate_Business,
    8     Kyc as businessKyc,
    9     MyBody as businessMyBody,
    10     Profile as businessProfile,
    11     UserAddress as businessAddress
    12 };
     6use MIQID\Plugin\Core\Frontend\Shortcode\Business\Certificate as shortcodeBusinessCertificate;
     7use MIQID\Plugin\Core\Frontend\Shortcode\Business\Kyc as shortcodeBusinessKyc;
     8use MIQID\Plugin\Core\Frontend\Shortcode\Business\MyBody as shortcodeBusinessMyBody;
     9use MIQID\Plugin\Core\Frontend\Shortcode\Business\Profile as shortcodeBusinessProfile;
     10use MIQID\Plugin\Core\Frontend\Shortcode\Business\UserAddress as shortcodeBusinessAddress;
     11use MIQID\Plugin\Core\Classes\DTO\Address as dtoPrivateAddress;
     12use MIQID\Plugin\Core\Classes\DTO\Business\DriversLicense as dtoBusinessDriversLicense;
     13use MIQID\Plugin\Core\Classes\DTO\Business\HealthInsuranceCard as dtoBusinessHealthInsuranceCard;
     14use MIQID\Plugin\Core\Classes\DTO\Business\MyBody as dtoBusinessMyBody;
     15use MIQID\Plugin\Core\Classes\DTO\Business\Passport as dtoBusinessPassport;
     16use MIQID\Plugin\Core\Classes\DTO\Business\Profile as dtoBusinessProfile;
     17use MIQID\Plugin\Core\Classes\DTO\Business\Showcase as dtoBusinessShowcase;
     18use MIQID\Plugin\Core\Classes\DTO\Business\UserAddress as dtoBusinessAddress;
     19use MIQID\Plugin\Core\Classes\DTO\DriversLicense as dtoPrivateDriversLicense;
     20use MIQID\Plugin\Core\Classes\DTO\Enum\PermissionType as enumPermission;
     21use MIQID\Plugin\Core\Classes\DTO\HttpResponse;
     22use MIQID\Plugin\Core\Classes\DTO\MyBody as dtoPrivateMyBody;
     23use MIQID\Plugin\Core\Classes\DTO\Passport as dtoPrivatePassport;
     24use MIQID\Plugin\Core\Classes\DTO\Profile as dtoPrivateProfile;
     25use MIQID\Plugin\Core\Classes\API\Business\Showcase;
    1326use MIQID\Plugin\Core\Util;
    1427use MyCLabs\Enum\Enum;
    … …  
    3447        Profile::Instance();
    3548
    36         businessKyc::Instance();
    37         businessMyBody::Instance();
    38         businessProfile::Instance();
    39         businessAddress::Instance();
    40         Certificate_Business::Instance();
     49        shortcodeBusinessKyc::Instance();
     50        shortcodeBusinessMyBody::Instance();
     51        shortcodeBusinessProfile::Instance();
     52        shortcodeBusinessAddress::Instance();
     53        shortcodeBusinessCertificate::Instance();
    4154    }
    4255
    … …  
    4962     */
    5063    public static function Shortcode_Output( array $atts, array $fields, $data ): array {
    51         $output = [];
     64        $output                 = [];
     65        /*$Permission             = $_REQUEST['Permission'] ?? 'Private';
     66        $Permission             = new enumPermission( enumPermission::$Permission() );
     67        $GetShowcaseInformation = new dtoBusinessShowcase();
     68
     69        if ( ( $profileId = ( $atts['profileid'] ?? Util::get_user_jwt()->get_jwt_payload()->get_profile_id() ) ) && ! empty( $profileId )
     70             && ( $GetShowcaseInformation = Showcase::Instance()->GetShowcaseInformation( $profileId ) )
     71             && $GetShowcaseInformation instanceof HttpResponse ) {
     72            $GetShowcaseInformation = new dtoBusinessShowcase();
     73        }*/
    5274
    5375        foreach ( array_filter( explode( ';', $atts['fields'] ) ) as $field ) {
    … …  
    83105                }
    84106
     107                /*$PermissionType = new enumPermission( enumPermission::Private );
     108
     109                switch ( get_class( $data ) ) {
     110                    case dtoPrivateProfile::class:
     111                    case dtoBusinessProfile::class:
     112                        if ( $profile_settings = $GetShowcaseInformation->get_settings()->get_profile_settings() ) {
     113                            $PermissionType_func = sprintf( 'get_%s', Util::snake_case( $field ) );
     114                            if ( method_exists( $profile_settings, $PermissionType_func ) ) {
     115                                $PermissionType = $profile_settings->$PermissionType_func();
     116                            }
     117                        }
     118                        break;
     119                    case dtoPrivateMyBody::class:
     120                    case dtoBusinessMyBody::class:
     121                        if ( $my_body_settings = $GetShowcaseInformation->get_settings()->get_my_body_settings() ) {
     122                            $PermissionType_func = sprintf( 'get_%s', Util::snake_case( $field ) );
     123                            if ( method_exists( $my_body_settings, $PermissionType_func ) ) {
     124                                $PermissionType = $my_body_settings->$PermissionType_func();
     125                            }
     126                        }
     127                        break;
     128                    case dtoPrivateDriversLicense::class:
     129                    case dtoBusinessDriversLicense::class:
     130                        if ( $certificate_settings = $GetShowcaseInformation->get_settings()->get_certificate_settings() ) {
     131                            $PermissionType = $certificate_settings->get_drivers_licence();
     132                        }
     133                        break;
     134                    case dtoPrivatePassport::class:
     135                    case dtoBusinessPassport::class:
     136                        if ( $certificate_settings = $GetShowcaseInformation->get_settings()->get_certificate_settings() ) {
     137                            $PermissionType = $certificate_settings->get_passport();
     138                        }
     139                        break;
     140                    case dtoBusinessHealthInsuranceCard::class:
     141                        if ( $certificate_settings = $GetShowcaseInformation->get_settings()->get_certificate_settings() ) {
     142                            $PermissionType = $certificate_settings->get_health_insurance();
     143                        }
     144                        break;
     145                    case dtoPrivateAddress::class:
     146                    case dtoBusinessAddress::class:
     147                        if ( $profile_settings = $GetShowcaseInformation->get_settings()->get_profile_settings() ) {
     148                            $PermissionType = $profile_settings->get_address();
     149                        }
     150                        break;
     151
     152                }
     153
     154                if ( $PermissionType->equals( enumPermission::NotSet ) ) {
     155                    $PermissionType = new enumPermission( enumPermission::Private );
     156                }
     157                if ( version_compare( $PermissionType, $Permission, '>' ) ) {
     158                    $value = sprintf(
     159                        _x( 'Data not shared with %s in MIQID.', 'PermissionType', 'miqid-core' ),
     160                        _x( $Permission->getKey(), 'PermissionType', 'miqid-core' ) );
     161                }*/
     162
     163                /*$value = nl2br( sprintf( '<ins>%s - %s</ins>
     164%s', $PermissionType, $Permission, $value ) );*/
     165
    85166                $output[ $field ] = $value;
    86167            }

  • miqid-core/trunk/src/Util.php

    r2513169 r2513894  
    131131    }
    132132
    133     static function get_profileId(): string {
     133    static function get_profileId(): ?string {
    134134        return $_REQUEST['profileId'] ?? self::get_user_jwt()->get_jwt_payload()->get_profile_id();
    135135    }
Note: See TracChangeset for help on using the changeset viewer.