@@ -130,76 +130,76 @@ discard block |
||
130 | 130 | |
131 | 131 | $meta = array(); |
132 | 132 | |
133 | - $meta['legacy_id'] = $config->id; |
|
134 | - $meta['id'] = $config->variant_id; |
|
135 | - $meta['mode'] = $config->mode; |
|
133 | + $meta[ 'legacy_id' ] = $config->id; |
|
134 | + $meta[ 'id' ] = $config->variant_id; |
|
135 | + $meta[ 'mode' ] = $config->mode; |
|
136 | 136 | |
137 | 137 | // iDEAL |
138 | - $meta['ideal_merchant_id'] = $config->merchant_id; |
|
139 | - $meta['ideal_sub_id'] = $config->sub_id; |
|
138 | + $meta[ 'ideal_merchant_id' ] = $config->merchant_id; |
|
139 | + $meta[ 'ideal_sub_id' ] = $config->sub_id; |
|
140 | 140 | |
141 | 141 | // iDEAL Basic |
142 | - $meta['ideal_hash_key'] = $config->hash_key; |
|
142 | + $meta[ 'ideal_hash_key' ] = $config->hash_key; |
|
143 | 143 | |
144 | 144 | // iDEAL Advanced |
145 | - $meta['ideal_private_key'] = $config->private_key; |
|
146 | - $meta['ideal_private_key_password'] = $config->private_key_password; |
|
147 | - $meta['ideal_private_certificate'] = $config->private_certificate; |
|
145 | + $meta[ 'ideal_private_key' ] = $config->private_key; |
|
146 | + $meta[ 'ideal_private_key_password' ] = $config->private_key_password; |
|
147 | + $meta[ 'ideal_private_certificate' ] = $config->private_certificate; |
|
148 | 148 | |
149 | 149 | // OmniKassa |
150 | 150 | if ( 'rabobank-omnikassa' === $config->variant_id ) { |
151 | - $meta['omnikassa_merchant_id'] = $config->merchant_id; |
|
152 | - $meta['omnikassa_secret_key'] = $config->hash_key; |
|
151 | + $meta[ 'omnikassa_merchant_id' ] = $config->merchant_id; |
|
152 | + $meta[ 'omnikassa_secret_key' ] = $config->hash_key; |
|
153 | 153 | |
154 | 154 | $key_version = @$config_meta->keyVersion; |
155 | 155 | // In Pronamic iDEAL v1.0 we stored the key version in the iDEAL sub ID |
156 | 156 | $key_version = empty( $key_version ) ? $config->sub_id : $key_version; |
157 | 157 | |
158 | - $meta['omnikassa_key_version'] = $key_version; |
|
158 | + $meta[ 'omnikassa_key_version' ] = $key_version; |
|
159 | 159 | |
160 | - unset( $meta['ideal_merchant_id'] ); |
|
161 | - unset( $meta['ideal_hash_key'] ); |
|
160 | + unset( $meta[ 'ideal_merchant_id' ] ); |
|
161 | + unset( $meta[ 'ideal_hash_key' ] ); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | // Buckaroo |
165 | - $meta['buckaroo_website_key'] = @$config_meta->buckarooWebsiteKey; |
|
166 | - $meta['buckaroo_secret_key'] = @$config_meta->buckarooSecretKey; |
|
165 | + $meta[ 'buckaroo_website_key' ] = @$config_meta->buckarooWebsiteKey; |
|
166 | + $meta[ 'buckaroo_secret_key' ] = @$config_meta->buckarooSecretKey; |
|
167 | 167 | |
168 | 168 | // Icepay |
169 | - $meta['icepay_merchant_id'] = @$config_meta->icepayMerchantId; |
|
170 | - $meta['icepay_secret_code'] = @$config_meta->icepaySecretCode; |
|
169 | + $meta[ 'icepay_merchant_id' ] = @$config_meta->icepayMerchantId; |
|
170 | + $meta[ 'icepay_secret_code' ] = @$config_meta->icepaySecretCode; |
|
171 | 171 | |
172 | 172 | // Mollie |
173 | - $meta['mollie_partner_id'] = @$config_meta->molliePartnerId; |
|
174 | - $meta['mollie_profile_key'] = @$config_meta->mollieProfileKey; |
|
173 | + $meta[ 'mollie_partner_id' ] = @$config_meta->molliePartnerId; |
|
174 | + $meta[ 'mollie_profile_key' ] = @$config_meta->mollieProfileKey; |
|
175 | 175 | |
176 | 176 | // Sisow |
177 | - $meta['sisow_merchant_id'] = @$config_meta->sisowMerchantId; |
|
178 | - $meta['sisow_merchant_key'] = @$config_meta->sisowMerchantKey; |
|
177 | + $meta[ 'sisow_merchant_id' ] = @$config_meta->sisowMerchantId; |
|
178 | + $meta[ 'sisow_merchant_key' ] = @$config_meta->sisowMerchantKey; |
|
179 | 179 | |
180 | 180 | // TargetPay |
181 | - $meta['targetpay_layout_code'] = @$config_meta->targetPayLayoutCode; |
|
181 | + $meta[ 'targetpay_layout_code' ] = @$config_meta->targetPayLayoutCode; |
|
182 | 182 | |
183 | 183 | // Qantani |
184 | - $meta['qantani_merchant_id'] = @$config_meta->qantani_merchant_id; |
|
185 | - $meta['qantani_merchant_key'] = @$config_meta->qantani_merchant_key; |
|
186 | - $meta['qantani_merchant_secret'] = @$config_meta->qantani_merchant_secret; |
|
184 | + $meta[ 'qantani_merchant_id' ] = @$config_meta->qantani_merchant_id; |
|
185 | + $meta[ 'qantani_merchant_key' ] = @$config_meta->qantani_merchant_key; |
|
186 | + $meta[ 'qantani_merchant_secret' ] = @$config_meta->qantani_merchant_secret; |
|
187 | 187 | |
188 | 188 | // Ogone |
189 | - $meta['ogone_psp_id'] = @$config_meta->pspId; |
|
190 | - $meta['ogone_sha_in_pass_phrase'] = @$config_meta->shaInPassPhrase; |
|
191 | - $meta['ogone_sha_out_pass_phrase'] = @$config_meta->shaOutPassPhrase; |
|
192 | - $meta['ogone_user_id'] = @$config_meta->ogone_user_id; |
|
193 | - $meta['ogone_password'] = @$config_meta->ogone_password; |
|
189 | + $meta[ 'ogone_psp_id' ] = @$config_meta->pspId; |
|
190 | + $meta[ 'ogone_sha_in_pass_phrase' ] = @$config_meta->shaInPassPhrase; |
|
191 | + $meta[ 'ogone_sha_out_pass_phrase' ] = @$config_meta->shaOutPassPhrase; |
|
192 | + $meta[ 'ogone_user_id' ] = @$config_meta->ogone_user_id; |
|
193 | + $meta[ 'ogone_password' ] = @$config_meta->ogone_password; |
|
194 | 194 | |
195 | 195 | // Other |
196 | - $meta['country'] = @$config_meta->country; |
|
197 | - $meta['state_or_province'] = @$config_meta->stateOrProvince; |
|
198 | - $meta['locality'] = @$config_meta->locality; |
|
199 | - $meta['organization'] = @$config_meta->organization; |
|
200 | - $meta['organization_unit'] = @$config_meta->organizationUnit; |
|
201 | - $meta['common_name'] = @$config_meta->commonName; |
|
202 | - $meta['email'] = @$config_meta->eMailAddress; |
|
196 | + $meta[ 'country' ] = @$config_meta->country; |
|
197 | + $meta[ 'state_or_province' ] = @$config_meta->stateOrProvince; |
|
198 | + $meta[ 'locality' ] = @$config_meta->locality; |
|
199 | + $meta[ 'organization' ] = @$config_meta->organization; |
|
200 | + $meta[ 'organization_unit' ] = @$config_meta->organizationUnit; |
|
201 | + $meta[ 'common_name' ] = @$config_meta->commonName; |
|
202 | + $meta[ 'email' ] = @$config_meta->eMailAddress; |
|
203 | 203 | |
204 | 204 | foreach ( $meta as $key => $value ) { |
205 | 205 | if ( ! empty( $value ) ) { |
@@ -300,26 +300,26 @@ discard block |
||
300 | 300 | |
301 | 301 | $feed_meta = json_decode( $feed->meta, true ); |
302 | 302 | |
303 | - $meta['form_id'] = $feed->form_id; |
|
304 | - $meta['config_id'] = @$config_ids_map[ $feed->configuration_id ]; |
|
305 | - $meta['is_active'] = $feed->is_active; |
|
306 | - $meta['transaction_description'] = @$feed_meta['transactionDescription']; |
|
307 | - $meta['delay_notification_ids'] = @$feed_meta['delayNotificationIds']; |
|
308 | - $meta['delay_admin_notification'] = @$feed_meta['delayAdminNotification']; |
|
309 | - $meta['delay_user_notification'] = @$feed_meta['delayUserNotification']; |
|
310 | - $meta['delay_post_creation'] = @$feed_meta['delayPostCreation']; |
|
311 | - $meta['condition_enabled'] = @$feed_meta['conditionEnabled']; |
|
312 | - $meta['condition_field_id'] = @$feed_meta['conditionFieldId']; |
|
313 | - $meta['condition_operator'] = @$feed_meta['conditionOperator']; |
|
314 | - $meta['condition_value'] = @$feed_meta['conditionValue']; |
|
315 | - $meta['user_role_field_id'] = @$feed_meta['userRoleFieldId']; |
|
316 | - $meta['fields'] = @$feed_meta['fields']; |
|
317 | - $meta['links'] = @$feed_meta['links']; |
|
318 | - |
|
319 | - if ( is_array( $meta['links'] ) ) { |
|
320 | - foreach ( $meta['links'] as &$link ) { |
|
321 | - if ( isset( $link['pageId'] ) ) { |
|
322 | - $link['page_id'] = $link['pageId']; |
|
303 | + $meta[ 'form_id' ] = $feed->form_id; |
|
304 | + $meta[ 'config_id' ] = @$config_ids_map[ $feed->configuration_id ]; |
|
305 | + $meta[ 'is_active' ] = $feed->is_active; |
|
306 | + $meta[ 'transaction_description' ] = @$feed_meta[ 'transactionDescription' ]; |
|
307 | + $meta[ 'delay_notification_ids' ] = @$feed_meta[ 'delayNotificationIds' ]; |
|
308 | + $meta[ 'delay_admin_notification' ] = @$feed_meta[ 'delayAdminNotification' ]; |
|
309 | + $meta[ 'delay_user_notification' ] = @$feed_meta[ 'delayUserNotification' ]; |
|
310 | + $meta[ 'delay_post_creation' ] = @$feed_meta[ 'delayPostCreation' ]; |
|
311 | + $meta[ 'condition_enabled' ] = @$feed_meta[ 'conditionEnabled' ]; |
|
312 | + $meta[ 'condition_field_id' ] = @$feed_meta[ 'conditionFieldId' ]; |
|
313 | + $meta[ 'condition_operator' ] = @$feed_meta[ 'conditionOperator' ]; |
|
314 | + $meta[ 'condition_value' ] = @$feed_meta[ 'conditionValue' ]; |
|
315 | + $meta[ 'user_role_field_id' ] = @$feed_meta[ 'userRoleFieldId' ]; |
|
316 | + $meta[ 'fields' ] = @$feed_meta[ 'fields' ]; |
|
317 | + $meta[ 'links' ] = @$feed_meta[ 'links' ]; |
|
318 | + |
|
319 | + if ( is_array( $meta[ 'links' ] ) ) { |
|
320 | + foreach ( $meta[ 'links' ] as &$link ) { |
|
321 | + if ( isset( $link[ 'pageId' ] ) ) { |
|
322 | + $link[ 'page_id' ] = $link[ 'pageId' ]; |
|
323 | 323 | } |
324 | 324 | } |
325 | 325 | } |
@@ -497,10 +497,10 @@ discard block |
||
497 | 497 | if ( $row ) { |
498 | 498 | $settings = maybe_unserialize( $row->value ); |
499 | 499 | |
500 | - if ( is_array( $settings ) && isset( $settings['pronamic_shopp_ideal_configuration'] ) ) { |
|
501 | - $value = $settings['pronamic_shopp_ideal_configuration']; |
|
500 | + if ( is_array( $settings ) && isset( $settings[ 'pronamic_shopp_ideal_configuration' ] ) ) { |
|
501 | + $value = $settings[ 'pronamic_shopp_ideal_configuration' ]; |
|
502 | 502 | |
503 | - $settings['config_id'] = @$config_ids_map[ $value ]; |
|
503 | + $settings[ 'config_id' ] = @$config_ids_map[ $value ]; |
|
504 | 504 | |
505 | 505 | $wpdb->update( |
506 | 506 | $shopp_meta_table, |
@@ -519,12 +519,12 @@ discard block |
||
519 | 519 | // @see https://github.com/pronamic/wp-pronamic-ideal/blob/1.3.4/classes/Pronamic/WooCommerce/IDeal/IDealGateway.php#L42 |
520 | 520 | $settings = get_option( 'woocommerce_pronamic_ideal_settings' ); |
521 | 521 | |
522 | -if ( is_array( $settings ) && isset( $settings['configuration_id'] ) ) { |
|
523 | - $value = $settings['configuration_id']; |
|
522 | +if ( is_array( $settings ) && isset( $settings[ 'configuration_id' ] ) ) { |
|
523 | + $value = $settings[ 'configuration_id' ]; |
|
524 | 524 | |
525 | - $settings['config_id'] = @$config_ids_map[ $value ]; |
|
525 | + $settings[ 'config_id' ] = @$config_ids_map[ $value ]; |
|
526 | 526 | |
527 | - unset( $settings['configuration_id'] ); |
|
527 | + unset( $settings[ 'configuration_id' ] ); |
|
528 | 528 | |
529 | 529 | update_option( 'woocommerce_pronamic_pay_ideal_settings', $settings ); |
530 | 530 | } |