| @@ -482,13 +482,8 @@ | ||
| 482 | 482 | 'makecommerce-bootstrap', |
| 483 | 483 | plugin_dir_url(__DIR__) . 'makecommerce/assets/bootstrap.5.3.3.min.css' |
| 484 | 484 | ); |
| 485 | 485 | |
| 486 | - wp_enqueue_style( | |
| 487 | - 'shipping-confirm', | |
| 488 | - 'https://static.maksekeskus.ee/modules/woocommerce/css/shipping-confirm.css' | |
| 489 | - ); | |
| 490 | - | |
| 491 | 486 | wp_enqueue_script( |
| 492 | 487 | 'makecommerce-bootstrap', |
| 493 | 488 | plugin_dir_url(__DIR__) . 'makecommerce/assets/bootstrap.bundle.min.js', |
| 494 | 489 | [], |
| @@ -540,9 +535,8 @@ | ||
| 540 | 535 | $_GET['page'] === 'makecommerce_shipping_plus' |
| 541 | 536 | ) { |
| 542 | 537 | update_option('mc_shipping_plus_confirmed', 'yes'); |
| 543 | 538 | update_option('mc_shipping_plus', 'yes'); |
| 544 | - update_option('makecommerce_install_status', 'upgrade'); | |
| 545 | 539 | $this->mc_shipping_plus_creds_migration(); |
| 546 | 540 | wp_redirect(admin_url('admin.php?page=makecommerce_dashboard')); |
| 547 | 541 | exit; |
| 548 | 542 | } |
| @@ -561,16 +555,17 @@ | ||
| 561 | 555 | 'mc_public_key' => 'mk_public_key', |
| 562 | 556 | 'mc_test_shop_id' => 'mk_test_shop_id', |
| 563 | 557 | 'mc_test_secret_key' => 'mk_test_private_key', |
| 564 | 558 | 'mc_test_public_key' => 'mk_test_public_key', |
| 565 | - 'mc_api_mode' => 'mk_api_type', | |
| 559 | + 'mc_api_mode' => 'mk_api_mode', | |
| 566 | 560 | ]; |
| 567 | 561 | |
| 568 | 562 | foreach ($migration_map as $new_key => $old_key) { |
| 563 | + $new_value = get_option($new_key, null); | |
| 569 | 564 | $old_value = get_option($old_key, null); |
| 570 | 565 | |
| 571 | - if ($old_value !== null) { | |
| 566 | + if (($new_value === '' || $new_value === null) && $old_value !== null && $old_value !== '') { | |
| 572 | 567 | update_option($new_key, $old_value); |
| 573 | 568 | } |
| 574 | 569 | } |
| 575 | 570 | } |
| 576 | 571 | } |
