diff --git a/commerce_kickstart.info b/commerce_kickstart.info index db0a147..6af35fa 100644 --- a/commerce_kickstart.info +++ b/commerce_kickstart.info @@ -82,14 +82,19 @@ dependencies[] = commerce_discount dependencies[] = commerce_discount_date dependencies[] = commerce_discount_usage dependencies[] = commerce_fancy_attributes -;dependencies[] = commerce_backoffice +dependencies[] = commerce_backoffice ; Install Features dependencies[] = features dependencies[] = commerce_features +; Install Migrate +dependencies[] = migrate +dependencies[] = commerce_migrate + ; Distribution modules. dependencies[] = commerce_kickstart_help dependencies[] = commerce_kickstart_inline_help -dependencies[] = commerce_kickstart_migrate +dependencies[] = commerce_kickstart_order +dependencies[] = commerce_kickstart_content_ui dependencies[] = commerce_kickstart_payment diff --git a/commerce_kickstart.install b/commerce_kickstart.install index 916d918..2b80447 100644 --- a/commerce_kickstart.install +++ b/commerce_kickstart.install @@ -175,8 +175,6 @@ function commerce_kickstart_install() { ->execute(); } - - // Insert default pre-defined node types into the database. $types = array( array( diff --git a/commerce_kickstart.profile b/commerce_kickstart.profile index d7b1e0f..2bac3d5 100644 --- a/commerce_kickstart.profile +++ b/commerce_kickstart.profile @@ -101,46 +101,26 @@ function commerce_kickstart_install_tasks() { // remove all the messages. drupal_get_messages(NULL, TRUE); $tasks = array(); - $commerce_kickstart_import_product = variable_get('commerce_kickstart_import_product', FALSE); - $commerce_kickstart_no_product = variable_get('commerce_kickstart_no_product', FALSE); - // Add a page allowing the user to indicate they'd like to install demo - // content. + $current_task = variable_get('install_task', 'done'); + $install_demo_store = variable_get('commerce_kickstart_demo_store', FALSE); + $tasks['commerce_kickstart_configure_store_form'] = array( 'display_name' => st('Configure store'), 'type' => 'form', ); - $tasks['commerce_kickstart_lite_product_enable_modules'] = array( - 'display_name' => st('Enable modules'), - 'display' => $commerce_kickstart_no_product, - 'type' => 'batch', - 'run' => $commerce_kickstart_import_product ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED, - ); - $tasks['commerce_kickstart_lite_product'] = array( - 'display_name' => st('Import products'), - 'display' => $commerce_kickstart_no_product, + $tasks['commerce_kickstart_install_additional_modules'] = array( + 'display_name' => $install_demo_store ? st('Install demo store') : st('Install additional functionality'), 'type' => 'batch', - 'run' => $commerce_kickstart_import_product ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED, + // Show this task only after the Kickstart steps have bene reached. + 'display' => strpos($current_task, 'commerce_kickstart_') !== FALSE, ); - $tasks['commerce_kickstart_lite_finalize'] = array( - 'display_name' => st('Finalize install'), - 'display' => $commerce_kickstart_no_product, + $tasks['commerce_kickstart_import_content'] = array( + 'display_name' => st('Import content'), 'type' => 'batch', - 'run' => $commerce_kickstart_import_product ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED, + // Show this task only after the Kickstart steps have bene reached. + 'display' => strpos($current_task, 'commerce_kickstart_') !== FALSE, ); - $tasks['commerce_kickstart_pre_import_product'] = array( - 'display_name' => st('Enable modules'), - 'display' => $commerce_kickstart_import_product, - 'type' => 'normal', - 'run' => $commerce_kickstart_import_product ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP, - ); - - $tasks['commerce_kickstart_import_product'] = array( - 'display_name' => st('Import products'), - 'display' => $commerce_kickstart_import_product, - 'type' => 'batch', - 'run' => $commerce_kickstart_import_product ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP, - ); return $tasks; } @@ -237,47 +217,45 @@ function commerce_kickstart_install_finished(&$install_state) { * Task callback: returns the form allowing the user to add example store content on install. */ function commerce_kickstart_configure_store_form() { - drupal_set_title(st('Configure store content')); + drupal_set_title(st('Configure store')); - // Prepare all the options for example content. + // Prepare all the options for sample content. $options = array( '1' => st('Yes'), '0' => st('No'), ); - $form['commerce_kickstart_example_wrapper'] = array( + $form['functionality'] = array( '#type' => 'fieldset', - '#title' => st('Example Content'), + '#title' => st('Functionality'), ); - $form['commerce_kickstart_example_wrapper']['commerce_kickstart_example_content'] = array( + $form['functionality']['install_demo_store'] = array( '#type' => 'radios', - '#title' => st('Do you want to install example store content?'), - '#description' => st('Recommended for new users. Demonstrates how you can set-up your Drupal Commerce site.'), + '#title' => st('Do you want to install the demo store?'), + '#description' => st('Shows you everything Commerce Kickstart can do. Includes a custom theme, sample content and products.'), '#options' => $options, '#default_value' => '1', ); + $options_selection = array( - 'sample_nodes' => 'Slideshow with its content', - 'sample_merchandising' => 'Ad push blocks with its content to feature some parts of the site', - 'sample_menus' => 'Commerce Kickstart admin menu.', - 'sample_blog' => 'Blog with its content.', - 'sample_social_login' => 'Social logins to allow users to login via social networks.', - 'sample_social_link' => 'Social links to allow users to share products via social networks.', - 'sample_zoom_cloud' => 'Zoom & Gallery mode for products.', + 'merchandising' => 'Frontpage slideshow and additional blocks for featuring specific content.', + 'menus' => 'Custom admin menu designed for store owners.', + 'blog' => 'Blog functionality.', + 'social' => 'Social logins and links for sharing products via social networks.', + 'zoom_cloud' => 'Zoom & Gallery mode for products.', ); - - $form['commerce_kickstart_example_wrapper']['commerce_kickstart_example_content_selection'] = array( + $form['functionality']['extras'] = array( '#type' => 'checkboxes', '#options' => $options_selection, - '#title' => t("Choose which features needs to be activated"), + '#title' => t("Install additional functionality"), '#states' => array( 'visible' => array( - ':input[name="commerce_kickstart_example_content"]' => array('value' => '0'), + ':input[name="install_demo_store"]' => array('value' => '0'), ), ), ); + // Build a currency options list from all defined currencies. $options = array(); - foreach (commerce_currencies(FALSE, TRUE) as $currency_code => $currency) { $options[$currency_code] = t('@code - !name', array( '@code' => $currency['code'], @@ -297,12 +275,11 @@ function commerce_kickstart_configure_store_form() { $form['commerce_default_currency_wrapper']['commerce_default_currency'] = array( '#type' => 'select', '#title' => t('Default store currency'), - '#description' => t('The default store currency will be used as the default for all price fields.'), '#options' => $options, '#default_value' => commerce_default_currency(), ); - // Prepare all the options for example content. + // Prepare all the options for sample content. $options = array( 'none' => st("No sample tax rate."), 'us' => st('US - Sales taxes displayed in checkout'), @@ -329,236 +306,142 @@ function commerce_kickstart_configure_store_form() { } /** - * Submit callback: creates the requested example content. + * Submit callback: creates the requested sample content. */ function commerce_kickstart_configure_store_form_submit(&$form, &$form_state) { - variable_set('commerce_kickstart_example_content', $form_state['values']['commerce_kickstart_example_content']); + variable_set('commerce_kickstart_demo_store', $form_state['values']['install_demo_store']); + variable_set('commerce_kickstart_selected_extras', $form_state['values']['extras']); variable_set('commerce_kickstart_choose_tax_country', $form_state['values']['commerce_kickstart_choose_tax_country']); variable_set('commerce_default_currency', $form_state['values']['commerce_default_currency']); - if ($form_state['values']['commerce_kickstart_example_content'] == 1) { - variable_set('commerce_kickstart_import_product', TRUE); - } - else { - variable_set('commerce_kickstart_no_product', TRUE); - variable_set('theme_default', 'omega'); - } - - // Select list - variable_set('commerce_kickstart_example_content_selection', $form_state['values']['commerce_kickstart_example_content_selection']); } -function commerce_kickstart_lite_product_enable_modules() { - - // Remove all messages we may have there. - drupal_get_messages(NULL, TRUE); - - $operations[] = array( - '_commerce_kickstart_lite_setup_theme', - array(t('Setup the blocks')) - ); - - $modules = array( - 'commerce_kickstart_content', - 'commerce_kickstart_lite_search', - 'commerce_kickstart_lite_product', - 'commerce_kickstart_lite_product_ui', - ); - - $user_selection = variable_get('commerce_kickstart_example_content_selection', array()); - - if (isset($user_selection['sample_social_login']) && $user_selection['sample_social_login']) { - $modules[] = 'commerce_kickstart_social'; - } - if (isset($user_selection['sample_merchandising']) && $user_selection['sample_merchandising']) { - $modules[] = 'commerce_kickstart_merchandising'; - $modules[] = 'commerce_kickstart_merchandising_ui'; - } - if (isset($user_selection['sample_menus']) && $user_selection['sample_menus']) { - $modules[] = 'commerce_kickstart_menus'; - $modules[] = 'commerce_kickstart_content_ui'; - } - if (isset($user_selection['sample_blog']) && $user_selection['sample_blog']) { - $modules[] = 'commerce_kickstart_blog'; - $modules[] = 'commerce_kickstart_blog_ui'; +/** + * Task callback: uses Batch API to import modules based on user selection. + * Installs all demo store modules if requested, or any modules providing + * additional functionality to the base install. + */ +function commerce_kickstart_install_additional_modules() { + $install_demo_store = variable_get('commerce_kickstart_demo_store', FALSE); + if ($install_demo_store) { + $modules = array( + 'commerce_kickstart_social', + 'commerce_kickstart_content', + 'commerce_kickstart_search', + 'commerce_kickstart_product', + 'commerce_kickstart_product_ui', + 'commerce_kickstart_blog', + 'commerce_kickstart_blog_ui', + 'commerce_kickstart_merchandising', + 'commerce_kickstart_merchandising_ui', + 'commerce_kickstart_menus', + 'commerce_kickstart_user', + 'commerce_kickstart_migrate', + ); } - if (isset($user_selection['sample_zoom_cloud']) && $user_selection['sample_zoom_cloud']) { - $modules[] = 'commerce_kickstart_lite_product_zoom'; + else { + $modules = array( + 'commerce_kickstart_content', + 'commerce_kickstart_lite_search', + 'commerce_kickstart_lite_product', + 'commerce_kickstart_lite_product_ui', + 'commerce_kickstart_migrate', + ); + $selected_extras = variable_get('commerce_kickstart_selected_extras', array()); + if (!empty($selected_extras['merchandising'])) { + $modules[] = 'commerce_kickstart_merchandising'; + $modules[] = 'commerce_kickstart_merchandising_ui'; + } + if (!empty($selected_extras['menus'])) { + $modules[] = 'commerce_kickstart_menus'; + } + if (!empty($selected_extras['blog'])) { + $modules[] = 'commerce_kickstart_blog'; + $modules[] = 'commerce_kickstart_blog_ui'; + } + if (!empty($selected_extras['social'])) { + $modules[] = 'commerce_kickstart_social'; + } + if (!empty($selected_extras['zoom_cloud'])) { + $modules[] = 'commerce_kickstart_lite_product_zoom'; + } } + // Resolve the dependencies now, so that module_enable() doesn't need + // to do it later for each individual module (which kills performance). + $files = system_rebuild_module_data(); + $modules_sorted = array(); foreach ($modules as $module) { - $operations[] = array( - '_commerce_kickstart_import_enable_module', - array($modules, t('Enable modules')) - ); + if ($files[$module]->requires) { + // Create a list of dependencies that haven't been installed yet. + $dependencies = array_keys($files[$module]->requires); + $dependencies = array_filter($dependencies, '_commerce_kickstart_filter_dependencies'); + // Add them to the module list. + $modules = array_merge($modules, $dependencies); + } } - // Batch api import products - module_enable($modules); - $batch = array( - 'title' => t('Pre Enable module.'), - 'operations' => $operations, - 'file' => drupal_get_path('profile', 'commerce_kickstart') . '/import/kickstart.import.inc', - ); - return $batch; -} - -/** - * Task callback: return a batch API array with the products to be imported. - */ -function commerce_kickstart_lite_product() { - drupal_set_title(st('Lite Import products')); -// Remove all messages we may have there. - //drupal_get_messages(NULL, TRUE); - - // Fixes problems when the CSV files used for importing have been created - // on a Mac, by forcing PHP to detect the appropriate line endings. - ini_set("auto_detect_line_endings", TRUE); - - $migrations = migrate_migrations(); - - // $operations[] = array('_commerce_kickstart_lite_enable_modules', array(t('Activate modules.'))); - $user_selection = variable_get('commerce_kickstart_example_content_selection', array()); - if (FALSE && $user_selection['sample_nodes']) { - //$operations[] = array('_commerce_kickstart_example_nodes', array(t('Setting up example nodes.'))); + $modules = array_unique($modules); + foreach ($modules as $module) { + $modules_sorted[$module] = $files[$module]->sort; } - $operations[] = array( - '_commerce_kickstart_example_taxes', - array(t('Setting up example taxes.')) - ); -// $operations[] = array('_commerce_kickstart_taxonomy_menu', array(t('Setting up menu.'))); + arsort($modules_sorted); - foreach ($migrations as $machine_name => $migration) { - if ($migration->getGroup()->getName() == 'default') { - continue; - } - $operations[] = array( - '_commerce_kickstart_import_example_products', - array($machine_name, t('Setting up example display.')) - ); + $operations = array(); + foreach ($modules_sorted as $module => $weight) { + $operations[] = array('_commerce_kickstart_enable_module', array($module, $files[$module]->info['name'])); } + $operations[] = array('_commerce_kickstart_flush_caches', array(t('Flushed caches.'))); - // Batch api import products $batch = array( - 'title' => t('Importing Products'), + 'title' => $install_demo_store ? t('Installing demo store') : t('Installing additional functionality'), 'operations' => $operations, 'file' => drupal_get_path('profile', 'commerce_kickstart') . '/import/kickstart.import.inc', ); - return $batch; -} - -function commerce_kickstart_lite_finalize() { - $user_selection = variable_get('commerce_kickstart_example_content_selection', array()); - - $front_theme = variable_get('theme_default', 'omega'); - if (isset($user_selection['sample_social_link']) && $user_selection['sample_social_link']) { - module_enable(array('service_links', 'widget_services')); - - // Enable service links in content types. - variable_set('service_links_node_types', array_keys(commerce_product_reference_node_types())); - variable_set('service_links_show', array( - 'twitter_widget' => 1, - 'facebook_like' => 1, - 'google_plus_one' => 1 - )); - // Rehash & enable block in content region. - try { - _block_rehash($front_theme); - db_update('block') - ->fields(array( - 'region' => 'content', - 'status' => '1', - 'weight' => '10', - 'visibility' => '0', - 'pages' => '', - 'title' => '', - 'cache' => '-1', - )) - ->condition('module', 'service_links') - ->condition('delta', 'service_links') - ->condition('theme', $front_theme) - ->execute(); - } catch (Exception $e) { - watchdog_exception('block', $e); - throw $e; - } - // Add service links permissions. - user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access service links')); - user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access service links')); - - } + return $batch; } /** - * Task callback: return a batch API array with the products to be imported. + * array_filter() callback used to filter out already installed dependencies. */ -function commerce_kickstart_pre_import_product() { - drupal_set_title(st('Enable modules.')); - module_enable(array( - 'commerce_kickstart_social', - 'commerce_kickstart_content', - 'commerce_kickstart_search', - 'commerce_kickstart_product', - 'commerce_kickstart_product_ui', - 'commerce_kickstart_order', - 'commerce_kickstart_blog', - 'commerce_kickstart_blog_ui', - 'commerce_kickstart_merchandising', - 'commerce_kickstart_merchandising_ui', - 'commerce_kickstart_menus', - 'commerce_kickstart_content_ui', - 'commerce_kickstart_user', - 'commerce_backoffice', - ) - ); +function _commerce_kickstart_filter_dependencies($dependency) { + return !module_exists($dependency); } /** * Task callback: return a batch API array with the products to be imported. */ -function commerce_kickstart_import_product() { - drupal_set_title(st('Import products')); - +function commerce_kickstart_import_content() { // Fixes problems when the CSV files used for importing have been created // on a Mac, by forcing PHP to detect the appropriate line endings. ini_set("auto_detect_line_endings", TRUE); - $migrations = migrate_migrations(); + $operations = array(); + $operations[] = array('_commerce_kickstart_example_taxes', array(t('Setting up taxes.'))); - $operations[] = array( - '_commerce_kickstart_example_taxes', - array(t('Setting up example taxes.')) - ); - $operations[] = array( - '_commerce_kickstart_taxonomy_menu', - array(t('Setting up menu.')) - ); + $install_demo_store = variable_get('commerce_kickstart_demo_store', FALSE); + if ($install_demo_store) { + $operations[] = array('_commerce_kickstart_taxonomy_menu', array(t('Setting up menus.'))); + $operations[] = array('_commerce_kickstart_example_user', array(t('Setting up users.'))); + } + // Run the migrations matching the install mode (demo store or not). + $migrations = migrate_migrations(); foreach ($migrations as $machine_name => $migration) { - if ($migration->getGroup()->getName() == 'no_content') { - continue; + $migration_group = $migration->getGroup()->getName(); + $expected_group = $install_demo_store ? 'demo_store' : 'default'; + if ($migration_group == $expected_group) { + $operations[] = array('_commerce_kickstart_import', array($machine_name, t('Importing content.'))); } - $operations[] = array( - '_commerce_kickstart_import_example_products', - array($machine_name, t('Setting up example display.')) - ); } - $operations[] = array( - '_commerce_kickstart_example_user', - array(t('Setting up example user.')) - ); - $operations[] = array( - '_commerce_kickstart_post_enable_modules', - array(t('Setting up example modules.')) - ); + // Perform post-import tasks. + $operations[] = array('_commerce_kickstart_post_import', array(t('Completing setup.'))); - // Batch api import products $batch = array( - 'title' => t('Importing Products'), + 'title' => t('Importing content'), 'operations' => $operations, 'file' => drupal_get_path('profile', 'commerce_kickstart') . '/import/kickstart.import.inc', ); - variable_set('install_configure_seachapi', TRUE); return $batch; } diff --git a/import/kickstart.import.inc b/import/kickstart.import.inc index 3620e32..6ef5f1b 100644 --- a/import/kickstart.import.inc +++ b/import/kickstart.import.inc @@ -1,129 +1,34 @@ $module_name)); } -function _commerce_kickstart_lite_setup_theme($operation, &$context) { - - $user_selection = variable_get('commerce_kickstart_example_content_selection', array()); - $default_theme = 'omega'; - $admin_theme = 'commerce_kickstart_admin'; - theme_enable(array($default_theme, $admin_theme)); -// variable_set('theme_default', $default_theme); - variable_set('admin_theme', $admin_theme); - variable_set('node_admin_theme', '1'); - - $blocks = array( - array( - 'module' => 'system', - 'delta' => 'main', - 'theme' => $default_theme, - 'status' => 1, - 'weight' => 0, - 'region' => 'content', - 'pages' => '', // Do not show the block on front. - 'visibility' => 0, - 'cache' => -1, - ), - array( - 'module' => 'system', - 'delta' => 'navigation', - 'theme' => $default_theme, - 'status' => 0, // Do not enable the navigation menu block. - 'weight' => 0, - 'region' => 'sidebar_first', - 'pages' => '', - 'cache' => -1, - ), - array( - 'module' => 'system', - 'delta' => 'help', - 'theme' => $default_theme, - 'status' => 1, - 'weight' => 0, - 'region' => 'preface_first', - 'pages' => '', - 'cache' => -1, - ), - array( - 'module' => 'system', - 'delta' => 'main', - 'theme' => $admin_theme, - 'status' => 1, - 'weight' => 0, - 'region' => 'content', - 'pages' => '', - 'cache' => -1, - ), - array( - 'module' => 'system', - 'delta' => 'help', - 'theme' => $admin_theme, - 'status' => 1, - 'weight' => 0, - 'region' => 'help', - 'pages' => '', - 'cache' => -1, - ), - array( - 'module' => 'user', - 'delta' => 'login', - 'theme' => $admin_theme, - 'status' => 1, - 'weight' => 10, - 'region' => 'content', - 'pages' => '', - 'cache' => -1, - ), - // Connector. - array( - 'module' => 'connector', - 'delta' => 'one_click_block', - 'theme' => $default_theme, - 'status' => 1, - 'weight' => 1, - 'region' => 'content', - 'pages' => "user\r\nuser/login", - 'visibility' => BLOCK_VISIBILITY_LISTED, - 'cache' => -1, - ), - // Search sorting. - array( - 'module' => 'search_api_sorts', - 'delta' => 'search-sorts', - 'theme' => $default_theme, - 'status' => 1, - 'weight' => -30, - 'region' => 'content', - 'pages' => '', - 'visibility' => 0, - 'cache' => -1, - ), - ); - drupal_static_reset(); - _block_rehash($admin_theme); - _block_rehash($default_theme); - foreach ($blocks as $record) { - $module = array_shift($record); - $delta = array_shift($record); - $theme = array_shift($record); - db_update('block') - ->fields($record) - ->condition('module', $module) - ->condition('delta', $delta) - ->condition('theme', $theme) - ->execute(); - } +/** + * BatchAPI callback. + * + * @see commerce_kickstart_install_additional_modules() + */ +function _commerce_kickstart_flush_caches($operation, &$context) { + $context['message'] = t('@operation', array('@operation' => $operation)); + drupal_flush_all_caches(); } + /** * BatchAPI callback. * - * @see commerce_kickstart_import_product() + * @see commerce_kickstart_import_content() */ function _commerce_kickstart_example_taxes($operation, &$context) { $context['message'] = t('@operation', array('@operation' => $operation)); @@ -213,14 +118,13 @@ function _commerce_kickstart_example_taxes($operation, &$context) { } } // delete the variables we used during this task. - variable_del('commerce_kickstart_example_content'); variable_del('commerce_kickstart_choose_tax_country'); } /** * BatchAPI callback. * - * @see commerce_kickstart_import_product() + * @see commerce_kickstart_import_content() */ function _commerce_kickstart_taxonomy_menu($operation, &$context) { $context['message'] = t('@operation', array('@operation' => $operation)); @@ -240,9 +144,9 @@ function _commerce_kickstart_taxonomy_menu($operation, &$context) { /** * BatchAPI callback. * - * @see commerce_kickstart_import_product() + * @see commerce_kickstart_import_content() */ -function _commerce_kickstart_import_example_products($operation, $type, &$context) { +function _commerce_kickstart_import($operation, $type, &$context) { $context['message'] = t('@operation', array('@operation' => $type)); $migration = Migration::getInstance($operation); $migration->processImport(); @@ -251,7 +155,7 @@ function _commerce_kickstart_import_example_products($operation, $type, &$contex /** * BatchAPI callback. * - * @see commerce_kickstart_import_product() + * @see commerce_kickstart_import_content() */ function _commerce_kickstart_example_user($operation, &$context) { $context['message'] = t('@operation', array('@operation' => $operation)); @@ -304,15 +208,140 @@ function _commerce_kickstart_example_user($operation, &$context) { /** * BatchAPI callback. * - * @see commerce_kickstart_import_product() + * @see commerce_kickstart_import_content() */ -function _commerce_kickstart_post_enable_modules($operation, &$context) { +function _commerce_kickstart_post_import($operation, &$context) { $context['message'] = t('@operation', array('@operation' => $operation)); + $install_demo_store = variable_get('commerce_kickstart_demo_store', FALSE); + if (!$install_demo_store) { + _commerce_kickstart_setup_omega_theme(); + } + features_rebuild(); drupal_static_reset(); } +/** + * Configures blocks for the theme during base install (no demo store). + */ +function _commerce_kickstart_setup_omega_theme() { + $default_theme = 'omega'; + $admin_theme = 'commerce_kickstart_admin'; + theme_enable(array($default_theme, $admin_theme)); + variable_set('theme_default', $default_theme); + variable_set('admin_theme', $admin_theme); + variable_set('node_admin_theme', '1'); + // Don't show the grid by default. + $omega_settings = array( + 'alpha_debug_grid_active' => FALSE, + ); + variable_set('theme_omega_settings', $omega_settings); + + $blocks = array( + array( + 'module' => 'system', + 'delta' => 'main', + 'theme' => $default_theme, + 'status' => 1, + 'weight' => 0, + 'region' => 'content', + 'pages' => '', // Do not show the block on front. + 'visibility' => 0, + 'cache' => -1, + ), + array( + 'module' => 'system', + 'delta' => 'navigation', + 'theme' => $default_theme, + 'status' => 0, // Do not enable the navigation menu block. + 'weight' => 0, + 'region' => 'sidebar_first', + 'pages' => '', + 'cache' => -1, + ), + array( + 'module' => 'system', + 'delta' => 'help', + 'theme' => $default_theme, + 'status' => 1, + 'weight' => 0, + 'region' => 'preface_first', + 'pages' => '', + 'cache' => -1, + ), + array( + 'module' => 'system', + 'delta' => 'main', + 'theme' => $admin_theme, + 'status' => 1, + 'weight' => 0, + 'region' => 'content', + 'pages' => '', + 'cache' => -1, + ), + array( + 'module' => 'system', + 'delta' => 'help', + 'theme' => $admin_theme, + 'status' => 1, + 'weight' => 0, + 'region' => 'help', + 'pages' => '', + 'cache' => -1, + ), + array( + 'module' => 'user', + 'delta' => 'login', + 'theme' => $admin_theme, + 'status' => 1, + 'weight' => 10, + 'region' => 'content', + 'pages' => '', + 'cache' => -1, + ), + // Connector. + array( + 'module' => 'connector', + 'delta' => 'one_click_block', + 'theme' => $default_theme, + 'status' => 1, + 'weight' => 1, + 'region' => 'content', + 'pages' => "user\r\nuser/login", + 'visibility' => BLOCK_VISIBILITY_LISTED, + 'cache' => -1, + ), + // Search sorting. + array( + 'module' => 'search_api_sorts', + 'delta' => 'search-sorts', + 'theme' => $default_theme, + 'status' => 1, + 'weight' => -30, + 'region' => 'content', + 'pages' => '', + 'visibility' => 0, + 'cache' => -1, + ), + ); + + drupal_static_reset(); + _block_rehash($admin_theme); + _block_rehash($default_theme); + foreach ($blocks as $record) { + $module = array_shift($record); + $delta = array_shift($record); + $theme = array_shift($record); + db_update('block') + ->fields($record) + ->condition('module', $module) + ->condition('delta', $delta) + ->condition('theme', $theme) + ->execute(); + } +} + /* * Helper function to create a sample order. * diff --git a/modules/commerce_kickstart/commerce_backoffice/commerce_backoffice.info b/modules/commerce_kickstart/commerce_backoffice/commerce_backoffice.info index a971c8b..a9cde98 100644 --- a/modules/commerce_kickstart/commerce_backoffice/commerce_backoffice.info +++ b/modules/commerce_kickstart/commerce_backoffice/commerce_backoffice.info @@ -20,9 +20,6 @@ dependencies[] = message_notify dependencies[] = views_bulk_operations dependencies[] = views_megarow -; Commerce Kickstart specific dependencies. -dependencies[] = commerce_kickstart_product - files[] = views/handlers/commerce_backoffice_handler_area_add_message.inc files[] = views/handlers/commerce_backoffice_handler_field_product_quick_edit_form.inc files[] = views/handlers/commerce_backoffice_handler_field_order_operations.inc diff --git a/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.info b/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.info index 7ff4f1f..f4c595b 100644 --- a/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.info +++ b/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.info @@ -1,10 +1,9 @@ -name = "Commerce kickstart migration" +name = Commerce Kickstart Migrate description = "Populate the distribution with some content." -package = "Commerce kickstart" +package = Commerce Kickstart core = 7.x dependencies[] = migrate dependencies[] = commerce_migrate -files[] = commerce_kickstart_migrate.migrate.inc - +files[] = commerce_kickstart_migrate.migrate.inc files[] = plugins/destinations/fields.inc diff --git a/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.install b/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.install index ac8976e..e169f08 100644 --- a/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.install +++ b/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.install @@ -5,17 +5,17 @@ */ function commerce_kickstart_migrate_install() { $types = array( - 'bags_cases', - 'drinks', - 'hats', - 'shoes', - 'storage_devices', - 'tops' + 'bags_cases', + 'drinks', + 'hats', + 'shoes', + 'storage_devices', + 'tops', ); foreach ($types as $type) { - Migration::registerMigration('CommerceKickstartNode', - 'CommerceKickstartNode' . $type, - array('type' => $type)); + Migration::registerMigration('CommerceKickstartNode', + 'CommerceKickstartNode' . $type, + array('type' => $type)); } } @@ -23,7 +23,6 @@ function commerce_kickstart_migrate_install() { * Implements hook_uninstall(). */ function commerce_kickstart_migrate_uninstall() { - $types = array( 'bags_cases', 'drinks', diff --git a/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.migrate.inc b/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.migrate.inc index e627e45..f0cd3f0 100644 --- a/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.migrate.inc +++ b/modules/commerce_kickstart/commerce_kickstart_migrate/commerce_kickstart_migrate.migrate.inc @@ -10,11 +10,6 @@ */ abstract class CommerceKickstartMigration extends Migration { - public function __construct() { - // Always call the parent constructor first for basic setup - parent::__construct(); - } - public function processImport(array $options = array()) { parent::processImport($options = array()); // Do not force menu rebuilding. Otherwise pathauto will try to rebuild @@ -32,7 +27,7 @@ abstract class CommerceKickstartMigration extends Migration { class CommerceKickstartBagsCases extends CommerceKickstartMigration { public function __construct() { - parent::__construct(); + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import bags cases from CSV file.'); // Create a map object for tracking the relationships between source rows @@ -96,7 +91,7 @@ class CommerceKickstartBagsCases extends CommerceKickstartMigration { class CommerceKickstartDrinks extends CommerceKickstartMigration { public function __construct() { - parent::__construct(); + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import drinks from CSV file.'); // Create a map object for tracking the relationships between source rows @@ -156,7 +151,7 @@ class CommerceKickstartDrinks extends CommerceKickstartMigration { class CommerceKickstartHats extends CommerceKickstartMigration { public function __construct() { - parent::__construct(); + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import hats from CSV file.'); // Create a map object for tracking the relationships between source rows @@ -222,8 +217,7 @@ class CommerceKickstartHats extends CommerceKickstartMigration { class CommerceKickstartTops extends CommerceKickstartMigration { public function __construct() { - - parent::__construct(); + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import tops from CSV file.'); // Create a map object for tracking the relationships between source rows @@ -288,7 +282,7 @@ class CommerceKickstartTops extends CommerceKickstartMigration { class CommerceKickstartShoes extends CommerceKickstartMigration { public function __construct() { - parent::__construct(); + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import shoes from CSV file.'); // Create a map object for tracking the relationships between source rows @@ -353,7 +347,7 @@ class CommerceKickstartShoes extends CommerceKickstartMigration { class CommerceKickstartStorage extends CommerceKickstartMigration { public function __construct() { - parent::__construct(); + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import storage from CSV file.'); // Create a map object for tracking the relationships between source rows @@ -419,11 +413,9 @@ class CommerceKickstartStorage extends CommerceKickstartMigration { class CommerceKickstartNode extends DynamicMigration { public function __construct(array $arguments) { + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->arguments = $arguments; - MIGRATION::__construct(MigrateGroup::getInstance('default', 'static_pages')); - $this->description = t('Import product nodes.'); - $this->dependencies = array('CommerceKickstartBagsCases', 'CommerceKickstartDrinks', 'CommerceKickstartHats', 'CommerceKickstartShoes', 'CommerceKickstartStorage', 'CommerceKickstartTops', 'CommerceKickstartPages'); // Create a map object for tracking the relationships between source rows @@ -502,8 +494,7 @@ class CommerceKickstartNode extends DynamicMigration { class CommerceKickstartPages extends Migration { public function __construct() { - parent::__construct(MigrateGroup::getInstance('static_pages'));; - + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import pages nodes.'); // Create a map object for tracking the relationships between source rows @@ -551,10 +542,8 @@ class CommerceKickstartPages extends Migration { class CommerceKickstartAdPush extends Migration { public function __construct() { - parent::__construct(MigrateGroup::getInstance('static_pages')); - + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import ad-push nodes.'); - $this->dependencies = array('CommerceKickstartPages'); // Create a map object for tracking the relationships between source rows @@ -606,10 +595,8 @@ class CommerceKickstartAdPush extends Migration { class CommerceKickstartBlogPost extends Migration { public function __construct() { - parent::__construct(MigrateGroup::getInstance('static_pages')); - + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import blog-post nodes.'); - $this->dependencies = array('CommerceKickstartPages'); // Create a map object for tracking the relationships between source rows @@ -667,10 +654,8 @@ class CommerceKickstartBlogPost extends Migration { class CommerceKickstartSlideshow extends Migration { public function __construct() { - parent::__construct(MigrateGroup::getInstance('static_pages')); - + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import slideshow nodes.'); - $this->dependencies = array('CommerceKickstartPages'); // Create a map object for tracking the relationships between source rows @@ -724,8 +709,7 @@ class CommerceKickstartSlideshow extends Migration { class CommerceKickstartCollection extends Migration { public function __construct() { - parent::__construct(); - + parent::__construct(MigrateGroup::getInstance('demo_store')); $this->description = t('Import collections terms.'); // Create a map object for tracking the relationships between source rows @@ -770,7 +754,7 @@ class CommerceKickstartCollection extends Migration { class CommerceKickstartSampleProduct extends CommerceKickstartMigration { public function __construct() { - Migration::__construct(MigrateGroup::getInstance('no_content')); + parent::__construct(); $this->description = t('Import bags cases from CSV file.'); // Create a map object for tracking the relationships between source rows @@ -782,34 +766,34 @@ class CommerceKickstartSampleProduct extends CommerceKickstartMigration { 'not null' => TRUE, ), ), - MigrateDestinationEntityAPI::getKeySchema('commerce_product', 'sample_product') + MigrateDestinationEntityAPI::getKeySchema('commerce_product', 'product') ); // Create a MigrateSource object. $this->source = new MigrateSourceCSV(drupal_get_path('module', 'commerce_kickstart_migrate') . '/csv/sample_product.csv', $this->csvcolumns(), array('header_rows' => 1), $this->fields()); - $this->destination = new MigrateDestinationEntityAPI('commerce_product', 'sample_product'); + $this->destination = new MigrateDestinationEntityAPI('commerce_product', 'product'); $this->addFieldMapping('title', 'title'); $this->addFieldMapping('sku', 'sku'); $this->addFieldMapping('commerce_price', 'price'); // Images - $this->addFieldMapping('field_sample_images', 'product_images'); - $this->addFieldMapping('field_sample_images:file_replace') + $this->addFieldMapping('field_images', 'product_images'); + $this->addFieldMapping('field_images:file_replace') ->defaultValue(FILE_EXISTS_REPLACE); - $this->addFieldMapping('field_sample_images:source_dir') + $this->addFieldMapping('field_images:source_dir') ->defaultValue(drupal_get_path('module', 'commerce_kickstart_migrate') . '/images'); // Size - $this->addFieldMapping('field_sample_size', 'size'); - $this->addFieldMapping('field_sample_size:create_term') + $this->addFieldMapping('field_size', 'size'); + $this->addFieldMapping('field_size:create_term') ->defaultValue(TRUE); // Color - $this->addFieldMapping('field_sample_color', 'color'); - $this->addFieldMapping('field_sample_color:additional_field', 'hexadecimal'); - $this->addFieldMapping('field_sample_color:create_term') + $this->addFieldMapping('field_color', 'color'); + $this->addFieldMapping('field_color:additional_field', 'hexadecimal'); + $this->addFieldMapping('field_color:create_term') ->defaultValue(TRUE); $this->addFieldMapping('uid', 'uid'); @@ -837,9 +821,7 @@ class CommerceKickstartSampleProduct extends CommerceKickstartMigration { class CommerceKickstartSampleNode extends CommerceKickstartMigration { public function __construct() { - Migration::__construct(MigrateGroup::getInstance('no_content')); - - + parent::__construct(); $this->description = t('Import product nodes.'); $this->dependencies = array( @@ -861,14 +843,14 @@ class CommerceKickstartSampleNode extends CommerceKickstartMigration { // Create a MigrateSource object. $this->source = new MigrateSourceCSV(drupal_get_path('module', 'commerce_kickstart_migrate') . '/csv/sample_nodes.csv', $this->csvcolumns(), array('header_rows' => 1)); - $this->destination = new MigrateDestinationNode('sample_product_display'); + $this->destination = new MigrateDestinationNode('product_display'); $this->addFieldMapping('uid', 'uid')->defaultValue(1); $this->addFieldMapping('title', 'title'); $this->addFieldMapping('body', 'description'); - $this->addFieldMapping('field_sample_product_category', 'category'); - $this->addFieldMapping('field_sample_product_category:create_term') + $this->addFieldMapping('field_product_category', 'category'); + $this->addFieldMapping('field_product_category:create_term') ->defaultValue(TRUE); $this->addFieldMapping('field_product_variations', 'skus'); } diff --git a/modules/commerce_kickstart/commerce_kickstart_migrate/csv/sample_product.csv b/modules/commerce_kickstart/commerce_kickstart_migrate/csv/sample_product.csv index 2f4d60d..371f91d 100644 --- a/modules/commerce_kickstart/commerce_kickstart_migrate/csv/sample_product.csv +++ b/modules/commerce_kickstart/commerce_kickstart_migrate/csv/sample_product.csv @@ -1,5 +1,5 @@ Title,SKU,Color,Size,Price,Images,Hexadecimal Code -Sample product 1,sample1,Sample Green,Sample L,16.00,"tote-1v1.jpg, tote-1v2.jpg, tote-1v3.jpg", "Sample category A", "field_sample_hexadecimal_code|#00FF00" -Sample product 2,sample2,Sample Blue,Sample S,62.00,"messenger-1v1.jpg, messenger-1v2.jpg, messenger-1v3.jpg, messenger-1v4.jpg", "Sample category B", "field_sample_hexadecimal_code|#0000FF" -Sample product 3,sample3,Sample white,Sample M,20.00,"tote-1v1.jpg, tote-1v2.jpg, tote-1v3.jpg", "Sample category A", "field_sample_hexadecimal_code|#FFFFFF" -Sample product 4,sample4,Sample Blue,Sample S,40.00,"messenger-1v1.jpg, messenger-1v2.jpg, messenger-1v3.jpg, messenger-1v4.jpg", "Sample category B", "field_sample_hexadecimal_code|#0000FF" +Sample product 1,sample1,Sample Green,Sample L,16.00,"tote-1v1.jpg, tote-1v2.jpg, tote-1v3.jpg", "Sample category A", "field_hexadecimal_code|#00FF00" +Sample product 2,sample2,Sample Blue,Sample S,62.00,"messenger-1v1.jpg, messenger-1v2.jpg, messenger-1v3.jpg, messenger-1v4.jpg", "Sample category B", "field_hexadecimal_code|#0000FF" +Sample product 3,sample3,Sample white,Sample M,20.00,"tote-1v1.jpg, tote-1v2.jpg, tote-1v3.jpg", "Sample category A", "field_hexadecimal_code|#FFFFFF" +Sample product 4,sample4,Sample Blue,Sample S,40.00,"messenger-1v1.jpg, messenger-1v2.jpg, messenger-1v3.jpg, messenger-1v4.jpg", "Sample category B", "field_hexadecimal_code|#0000FF" diff --git a/modules/commerce_kickstart/commerce_kickstart_order/commerce_kickstart_order.info b/modules/commerce_kickstart/commerce_kickstart_order/commerce_kickstart_order.info index 0169398..4aa2589 100644 --- a/modules/commerce_kickstart/commerce_kickstart_order/commerce_kickstart_order.info +++ b/modules/commerce_kickstart/commerce_kickstart_order/commerce_kickstart_order.info @@ -7,5 +7,4 @@ dependencies[] = views dependencies[] = message dependencies[] = message_notify dependencies[] = commerce_cart -dependencies[] = commerce_kickstart_product_ui dependencies[] = ctools diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_blog_ui/commerce_kickstart_blog_ui.install b/modules/commerce_kickstart/demo_content/commerce_kickstart_blog_ui/commerce_kickstart_blog_ui.install index 7f1866d..784afdf 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_blog_ui/commerce_kickstart_blog_ui.install +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_blog_ui/commerce_kickstart_blog_ui.install @@ -15,8 +15,9 @@ function commerce_kickstart_blog_ui_enable() { _features_restore('enable', $items); _features_restore('rebuild', $items); - // For some unknow reason, we need to manually trigger the rebuild of the - // menu links, in features otherwise they won't appears. + // For some unknown reason, we need to manually trigger the rebuild of the + // menu links, in features otherwise they won't appear. + // @todo Investigate. features_revert(array($module => array('menu_links'))); drupal_static_reset(); diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.field.inc b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.field.inc index 7d30773..f5b3aed 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.field.inc +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.field.inc @@ -10,8 +10,8 @@ function commerce_kickstart_lite_product_field_default_fields() { $fields = array(); - // Exported field: 'commerce_product-sample_product-commerce_price'. - $fields['commerce_product-sample_product-commerce_price'] = array( + // Exported field: 'commerce_product-product-commerce_price'. + $fields['commerce_product-product-commerce_price'] = array( 'field_config' => array( 'active' => '1', 'cardinality' => '1', @@ -34,7 +34,7 @@ function commerce_kickstart_lite_product_field_default_fields() { 'type' => 'commerce_price', ), 'field_instance' => array( - 'bundle' => 'sample_product', + 'bundle' => 'product', 'default_value' => NULL, 'deleted' => '0', 'description' => '', @@ -130,14 +130,14 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ); - // Exported field: 'commerce_product-sample_product-field_sample_color'. - $fields['commerce_product-sample_product-field_sample_color'] = array( + // Exported field: 'commerce_product-product-field_color'. + $fields['commerce_product-product-field_color'] = array( 'field_config' => array( 'active' => '1', 'cardinality' => '1', 'deleted' => '0', 'entity_types' => array(), - 'field_name' => 'field_sample_color', + 'field_name' => 'field_color', 'foreign keys' => array( 'tid' => array( 'columns' => array( @@ -156,7 +156,7 @@ function commerce_kickstart_lite_product_field_default_fields() { 'settings' => array( 'allowed_values' => array( 0 => array( - 'vocabulary' => 'sample_color', + 'vocabulary' => 'colors', 'parent' => '0', ), ), @@ -165,7 +165,7 @@ function commerce_kickstart_lite_product_field_default_fields() { 'type' => 'taxonomy_term_reference', ), 'field_instance' => array( - 'bundle' => 'sample_product', + 'bundle' => 'product', 'commerce_cart_settings' => array( 'attribute_field' => 1, 'attribute_widget' => 'commerce_fancy_attributes', @@ -207,8 +207,8 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ), 'entity_type' => 'commerce_product', - 'field_name' => 'field_sample_color', - 'label' => 'Sample color', + 'field_name' => 'field_color', + 'label' => 'Color', 'required' => 0, 'settings' => array( 'user_register_form' => FALSE, @@ -223,14 +223,14 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ); - // Exported field: 'commerce_product-sample_product-field_sample_images'. - $fields['commerce_product-sample_product-field_sample_images'] = array( + // Exported field: 'commerce_product-product-field_images'. + $fields['commerce_product-product-field_images'] = array( 'field_config' => array( 'active' => '1', 'cardinality' => '-1', 'deleted' => '0', 'entity_types' => array(), - 'field_name' => 'field_sample_images', + 'field_name' => 'field_images', 'foreign keys' => array( 'fid' => array( 'columns' => array( @@ -254,7 +254,7 @@ function commerce_kickstart_lite_product_field_default_fields() { 'type' => 'image', ), 'field_instance' => array( - 'bundle' => 'sample_product', + 'bundle' => 'product', 'deleted' => '0', 'description' => '', 'display' => array( @@ -298,8 +298,8 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ), 'entity_type' => 'commerce_product', - 'field_name' => 'field_sample_images', - 'label' => 'Sample images', + 'field_name' => 'field_images', + 'label' => 'Images', 'required' => 0, 'settings' => array( 'alt_field' => 0, @@ -325,14 +325,14 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ); - // Exported field: 'commerce_product-sample_product-field_sample_size'. - $fields['commerce_product-sample_product-field_sample_size'] = array( + // Exported field: 'commerce_product-product-field_size'. + $fields['commerce_product-product-field_size'] = array( 'field_config' => array( 'active' => '1', 'cardinality' => '1', 'deleted' => '0', 'entity_types' => array(), - 'field_name' => 'field_sample_size', + 'field_name' => 'field_size', 'foreign keys' => array( 'tid' => array( 'columns' => array( @@ -351,7 +351,7 @@ function commerce_kickstart_lite_product_field_default_fields() { 'settings' => array( 'allowed_values' => array( 0 => array( - 'vocabulary' => 'sample_size', + 'vocabulary' => 'sizes', 'parent' => '0', ), ), @@ -360,7 +360,7 @@ function commerce_kickstart_lite_product_field_default_fields() { 'type' => 'taxonomy_term_reference', ), 'field_instance' => array( - 'bundle' => 'sample_product', + 'bundle' => 'product', 'commerce_cart_settings' => array( 'attribute_field' => 1, 'attribute_widget' => 'select', @@ -402,8 +402,8 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ), 'entity_type' => 'commerce_product', - 'field_name' => 'field_sample_size', - 'label' => 'Sample size', + 'field_name' => 'field_size', + 'label' => 'Size', 'required' => 0, 'settings' => array( 'user_register_form' => FALSE, @@ -418,8 +418,8 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ); - // Exported field: 'node-sample_product_display-body'. - $fields['node-sample_product_display-body'] = array( + // Exported field: 'node-product_display-body'. + $fields['node-product_display-body'] = array( 'field_config' => array( 'active' => '1', 'cardinality' => '1', @@ -448,7 +448,7 @@ function commerce_kickstart_lite_product_field_default_fields() { 'type' => 'text_long', ), 'field_instance' => array( - 'bundle' => 'sample_product_display', + 'bundle' => 'product_display', 'default_value' => NULL, 'deleted' => '0', 'description' => '', @@ -497,51 +497,52 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ); - // Exported field: 'node-sample_product_display-field_product_variations'. - $fields['node-sample_product_display-field_product_variations'] = array( + // Exported field: 'node-product_display-field_product_category'. + $fields['node-product_display-field_product_category'] = array( 'field_config' => array( 'active' => '1', - 'cardinality' => '-1', + 'cardinality' => '1', 'deleted' => '0', 'entity_types' => array(), - 'field_name' => 'field_product_variations', + 'field_name' => 'field_product_category', 'foreign keys' => array( - 'product_id' => array( + 'tid' => array( 'columns' => array( - 'product_id' => 'product_id', + 'tid' => 'tid', ), - 'table' => 'commerce_product', + 'table' => 'taxonomy_term_data', ), ), 'indexes' => array( - 'product_id' => array( - 0 => 'product_id', + 'tid' => array( + 0 => 'tid', ), ), 'locked' => '0', - 'module' => 'commerce_product_reference', - 'settings' => array(), + 'module' => 'taxonomy', + 'settings' => array( + 'allowed_values' => array( + 0 => array( + 'vocabulary' => 'product_category', + 'parent' => '0', + ), + ), + ), 'translatable' => '0', - 'type' => 'commerce_product_reference', + 'type' => 'taxonomy_term_reference', ), 'field_instance' => array( - 'bundle' => 'sample_product_display', + 'bundle' => 'product_display', 'default_value' => NULL, 'deleted' => '0', 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'commerce_cart', - 'settings' => array( - 'combine' => TRUE, - 'default_quantity' => 1, - 'line_item_type' => 'product', - 'show_quantity' => FALSE, - 'show_single_product_attributes' => FALSE, - ), - 'type' => 'commerce_cart_add_to_cart_form', - 'weight' => 2, + 'module' => 'taxonomy', + 'settings' => array(), + 'type' => 'taxonomy_term_reference_link', + 'weight' => 1, ), 'product_list' => array( 'label' => 'above', @@ -557,76 +558,67 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ), 'entity_type' => 'node', - 'field_name' => 'field_product_variations', - 'label' => 'Product variations', + 'field_name' => 'field_product_category', + 'label' => 'Product category', 'required' => 0, 'settings' => array( - 'field_injection' => 1, - 'referenceable_types' => array( - 'sample_product' => 0, - ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'commerce_product_reference', - 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'commerce_product/autocomplete', - 'size' => '60', - ), - 'type' => 'commerce_product_reference_autocomplete', - 'weight' => '33', + 'module' => 'options', + 'settings' => array(), + 'type' => 'options_select', + 'weight' => '32', ), ), ); - // Exported field: 'node-sample_product_display-field_sample_product_category'. - $fields['node-sample_product_display-field_sample_product_category'] = array( + // Exported field: 'node-product_display-field_product_variations'. + $fields['node-product_display-field_product_variations'] = array( 'field_config' => array( 'active' => '1', - 'cardinality' => '1', + 'cardinality' => '-1', 'deleted' => '0', 'entity_types' => array(), - 'field_name' => 'field_sample_product_category', + 'field_name' => 'field_product_variations', 'foreign keys' => array( - 'tid' => array( + 'product_id' => array( 'columns' => array( - 'tid' => 'tid', + 'product_id' => 'product_id', ), - 'table' => 'taxonomy_term_data', + 'table' => 'commerce_product', ), ), 'indexes' => array( - 'tid' => array( - 0 => 'tid', + 'product_id' => array( + 0 => 'product_id', ), ), 'locked' => '0', - 'module' => 'taxonomy', - 'settings' => array( - 'allowed_values' => array( - 0 => array( - 'vocabulary' => 'sample_product_category', - 'parent' => '0', - ), - ), - ), + 'module' => 'commerce_product_reference', + 'settings' => array(), 'translatable' => '0', - 'type' => 'taxonomy_term_reference', + 'type' => 'commerce_product_reference', ), 'field_instance' => array( - 'bundle' => 'sample_product_display', + 'bundle' => 'product_display', 'default_value' => NULL, 'deleted' => '0', 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'taxonomy', - 'settings' => array(), - 'type' => 'taxonomy_term_reference_link', - 'weight' => 1, + 'module' => 'commerce_cart', + 'settings' => array( + 'combine' => TRUE, + 'default_quantity' => 1, + 'line_item_type' => 'product', + 'show_quantity' => FALSE, + 'show_single_product_attributes' => FALSE, + ), + 'type' => 'commerce_cart_add_to_cart_form', + 'weight' => 2, ), 'product_list' => array( 'label' => 'above', @@ -642,30 +634,40 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ), 'entity_type' => 'node', - 'field_name' => 'field_sample_product_category', - 'label' => 'Sample product category', + 'field_name' => 'field_product_variations', + 'label' => 'Product variations', 'required' => 0, 'settings' => array( + 'field_injection' => 1, + 'referenceable_types' => array( + 'product' => 0, + ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', - 'weight' => '32', + 'module' => 'inline_entity_form', + 'settings' => array( + 'fields' => array(), + 'type_settings' => array( + 'autogenerate_title' => 1, + 'use_variation_language' => 1, + ), + ), + 'type' => 'inline_entity_form', + 'weight' => '33', ), ), ); - // Exported field: 'taxonomy_term-sample_color-field_sample_hexadecimal_code'. - $fields['taxonomy_term-sample_color-field_sample_hexadecimal_code'] = array( + // Exported field: 'taxonomy_term-colors-field_hexadecimal_code'. + $fields['taxonomy_term-colors-field_hexadecimal_code'] = array( 'field_config' => array( 'active' => '1', 'cardinality' => '1', 'deleted' => '0', 'entity_types' => array(), - 'field_name' => 'field_sample_hexadecimal_code', + 'field_name' => 'field_hexadecimal_code', 'foreign keys' => array( 'format' => array( 'columns' => array( @@ -688,7 +690,7 @@ function commerce_kickstart_lite_product_field_default_fields() { 'type' => 'text', ), 'field_instance' => array( - 'bundle' => 'sample_color', + 'bundle' => 'colors', 'default_value' => NULL, 'deleted' => '0', 'description' => '', @@ -709,8 +711,8 @@ function commerce_kickstart_lite_product_field_default_fields() { ), ), 'entity_type' => 'taxonomy_term', - 'field_name' => 'field_sample_hexadecimal_code', - 'label' => 'Sample Hexadecimal code', + 'field_name' => 'field_hexadecimal_code', + 'label' => 'Hexadecimal code', 'required' => FALSE, 'settings' => array( 'text_processing' => 0, @@ -730,13 +732,13 @@ function commerce_kickstart_lite_product_field_default_fields() { // Translatables // Included for use with string extractors like potx. t('Body'); + t('Color'); + t('Hexadecimal code'); + t('Images'); t('Price'); + t('Product category'); t('Product variations'); - t('Sample Hexadecimal code'); - t('Sample color'); - t('Sample images'); - t('Sample product category'); - t('Sample size'); + t('Size'); return $fields; } diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.inc b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.inc index 779fe0f..c20cea4 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.inc +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.inc @@ -5,28 +5,6 @@ */ /** - * Implements hook_commerce_product_default_types(). - */ -function commerce_kickstart_lite_product_commerce_product_default_types() { - $items = array( - 'sample_product' => array( - 'type' => 'sample_product', - 'name' => 'Sample product', - 'description' => '', - 'help' => '', - 'revision' => '1', - 'module' => 'commerce_product_ui', - 'autosku' => array( - 'product_type' => 'sample_product', - 'pattern' => '', - 'advanced' => array(), - ), - ), - ); - return $items; -} - -/** * Implements hook_ctools_plugin_api(). */ function commerce_kickstart_lite_product_ctools_plugin_api() { @@ -120,8 +98,8 @@ function commerce_kickstart_lite_product_image_default_styles() { */ function commerce_kickstart_lite_product_node_info() { $items = array( - 'sample_product_display' => array( - 'name' => t('Sample product display'), + 'product_display' => array( + 'name' => t('Product display'), 'base' => 'node_content', 'description' => '', 'has_title' => '1', @@ -137,11 +115,11 @@ function commerce_kickstart_lite_product_node_info() { */ function commerce_kickstart_lite_product_default_search_api_index() { $items = array(); - $items['kickstart_sample_product_display'] = entity_import('search_api_index', '{ - "name" : "Kickstart_sample_product_display", - "machine_name" : "kickstart_sample_product_display", + $items['kickstart_product_display'] = entity_import('search_api_index', '{ + "name" : "Kickstart_product_display", + "machine_name" : "kickstart_product_display", "description" : null, - "server" : "kickstart_sample_product_display", + "server" : "kickstart_product_display", "item_type" : "node", "options" : { "index_directly" : 1, @@ -150,8 +128,8 @@ function commerce_kickstart_lite_product_default_search_api_index() { "title" : { "type" : "text" }, "search_api_language" : { "type" : "string" }, "field_product_variations:title" : { "type" : "list\\u003Ctext\\u003E" }, - "field_product_variations:field_sample_color" : { "type" : "list\\u003Cinteger\\u003E", "entity_type" : "taxonomy_term" }, - "field_product_variations:field_sample_size" : { "type" : "list\\u003Cinteger\\u003E", "entity_type" : "taxonomy_term" } + "field_product_variations:field_color" : { "type" : "list\\u003Cinteger\\u003E", "entity_type" : "taxonomy_term" }, + "field_product_variations:field_size" : { "type" : "list\\u003Cinteger\\u003E", "entity_type" : "taxonomy_term" } }, "data_alter_callbacks" : { "search_api_ranges_alter" : { "status" : 0, "weight" : "-50", "settings" : { "fields" : [] } }, @@ -160,7 +138,7 @@ function commerce_kickstart_lite_product_default_search_api_index() { "weight" : "-10", "settings" : { "default" : "0", - "bundles" : { "sample_product_display" : "sample_product_display" } + "bundles" : { "product_display" : "product_display" } } }, "search_api_alter_node_access" : { "status" : 0, "weight" : "0", "settings" : [] }, diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.taxonomy.inc b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.taxonomy.inc index 92c0f4d..b5b8707 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.taxonomy.inc +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.features.taxonomy.inc @@ -9,25 +9,25 @@ */ function commerce_kickstart_lite_product_taxonomy_default_vocabularies() { return array( - 'sample_color' => array( - 'name' => 'Sample color', - 'machine_name' => 'sample_color', + 'colors' => array( + 'name' => 'Colors', + 'machine_name' => 'colors', 'description' => '', 'hierarchy' => '0', 'module' => 'taxonomy', 'weight' => '0', ), - 'sample_product_category' => array( - 'name' => 'Sample product category', - 'machine_name' => 'sample_product_category', + 'product_category' => array( + 'name' => 'Product category', + 'machine_name' => 'product_category', 'description' => '', 'hierarchy' => '0', 'module' => 'taxonomy', 'weight' => '0', ), - 'sample_size' => array( - 'name' => 'Sample size', - 'machine_name' => 'sample_size', + 'sizes' => array( + 'name' => 'Sizes', + 'machine_name' => 'sizes', 'description' => '', 'hierarchy' => '0', 'module' => 'taxonomy', diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.info b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.info index 01d169f..e939b8f 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.info +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.info @@ -27,41 +27,40 @@ dependencies[] = search_api_facetapi dependencies[] = search_api_views dependencies[] = strongarm dependencies[] = taxonomy -features[commerce_product_type][] = sample_product features[ctools][] = facetapi:facetapi_defaults:1 features[ctools][] = strongarm:strongarm:1 features[features_api][] = api:1 -features[field][] = commerce_product-sample_product-commerce_price -features[field][] = commerce_product-sample_product-field_sample_color -features[field][] = commerce_product-sample_product-field_sample_images -features[field][] = commerce_product-sample_product-field_sample_size -features[field][] = node-sample_product_display-body -features[field][] = node-sample_product_display-field_product_variations -features[field][] = node-sample_product_display-field_sample_product_category -features[field][] = taxonomy_term-sample_color-field_sample_hexadecimal_code +features[field][] = commerce_product-product-commerce_price +features[field][] = commerce_product-product-field_color +features[field][] = commerce_product-product-field_images +features[field][] = commerce_product-product-field_size +features[field][] = node-product_display-body +features[field][] = node-product_display-field_product_variations +features[field][] = node-product_display-field_product_category +features[field][] = taxonomy_term-colors-field_hexadecimal_code features[image][] = product_full features[image][] = product_medium features[image][] = product_thumbnail -features[node][] = sample_product_display -features[search_api_index][] = kickstart_sample_product_display -features[taxonomy][] = sample_color -features[taxonomy][] = sample_product_category -features[taxonomy][] = sample_size -features[variable][] = comment_anonymous_sample_product_display -features[variable][] = comment_default_mode_sample_product_display -features[variable][] = comment_default_per_page_sample_product_display -features[variable][] = comment_form_location_sample_product_display -features[variable][] = comment_preview_sample_product_display -features[variable][] = comment_sample_product_display -features[variable][] = comment_subject_field_sample_product_display -features[variable][] = field_bundle_settings_commerce_product__sample_product +features[node][] = product_display +features[search_api_index][] = kickstart_product_display +features[taxonomy][] = colors +features[taxonomy][] = product_category +features[taxonomy][] = sizes +features[variable][] = comment_anonymous_product_display +features[variable][] = comment_default_mode_product_display +features[variable][] = comment_default_per_page_product_display +features[variable][] = comment_form_location_product_display +features[variable][] = comment_preview_product_display +features[variable][] = comment_product_display +features[variable][] = comment_subject_field_product_display +features[variable][] = field_bundle_settings_commerce_product__product features[variable][] = kickstart_jirafe_terms features[variable][] = kickstart_jirafe_types -features[variable][] = menu_options_sample_product_display -features[variable][] = menu_parent_sample_product_display -features[variable][] = node_options_sample_product_display -features[variable][] = node_preview_sample_product_display -features[variable][] = node_submitted_sample_product_display +features[variable][] = menu_options_product_display +features[variable][] = menu_parent_product_display +features[variable][] = node_options_product_display +features[variable][] = node_preview_product_display +features[variable][] = node_submitted_product_display features[variable][] = pathauto_node_pattern features[variable][] = pathauto_punctuation_hyphen features[variable][] = pathauto_taxonomy_term_pattern diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.install b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.install index 15f0c90..6f72314 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.install +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.install @@ -16,7 +16,7 @@ function commerce_kickstart_lite_product_enable() { _features_restore('rebuild', $items); entity_defaults_rebuild(); - $index = entity_load_single('search_api_index', 'kickstart_sample_product_display'); + $index = entity_load_single('search_api_index', 'kickstart_product_display'); $index->server()->fieldsUpdated($index); // $index = entity_load_single('search_api_index', 'search_commerce_product'); // $index->server()->fieldsUpdated($index); diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.module b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.module index 9a87b50..896bf50 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.module +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product/commerce_kickstart_lite_product.module @@ -1,15 +1,7 @@ disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'comment_anonymous_sample_product_display'; + $strongarm->name = 'comment_anonymous_product_display'; $strongarm->value = 0; - $export['comment_anonymous_sample_product_display'] = $strongarm; + $export['comment_anonymous_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'comment_default_mode_sample_product_display'; + $strongarm->name = 'comment_default_mode_product_display'; $strongarm->value = 1; - $export['comment_default_mode_sample_product_display'] = $strongarm; + $export['comment_default_mode_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'comment_default_per_page_sample_product_display'; + $strongarm->name = 'comment_default_per_page_product_display'; $strongarm->value = '50'; - $export['comment_default_per_page_sample_product_display'] = $strongarm; + $export['comment_default_per_page_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'comment_form_location_sample_product_display'; + $strongarm->name = 'comment_form_location_product_display'; $strongarm->value = 1; - $export['comment_form_location_sample_product_display'] = $strongarm; + $export['comment_form_location_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'comment_preview_sample_product_display'; + $strongarm->name = 'comment_preview_product_display'; $strongarm->value = '1'; - $export['comment_preview_sample_product_display'] = $strongarm; + $export['comment_preview_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'comment_sample_product_display'; + $strongarm->name = 'comment_product_display'; $strongarm->value = '2'; - $export['comment_sample_product_display'] = $strongarm; + $export['comment_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'comment_subject_field_sample_product_display'; + $strongarm->name = 'comment_subject_field_product_display'; $strongarm->value = 1; - $export['comment_subject_field_sample_product_display'] = $strongarm; + $export['comment_subject_field_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'field_bundle_settings_commerce_product__sample_product'; + $strongarm->name = 'field_bundle_settings_commerce_product__product'; $strongarm->value = array( 'view_modes' => array( 'line_item' => array( @@ -139,7 +139,7 @@ function commerce_kickstart_lite_product_strongarm() { ), ), ); - $export['field_bundle_settings_commerce_product__sample_product'] = $strongarm; + $export['field_bundle_settings_commerce_product__product'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ @@ -170,41 +170,41 @@ function commerce_kickstart_lite_product_strongarm() { $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'menu_options_sample_product_display'; + $strongarm->name = 'menu_options_product_display'; $strongarm->value = array( 0 => 'main-menu', ); - $export['menu_options_sample_product_display'] = $strongarm; + $export['menu_options_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'menu_parent_sample_product_display'; + $strongarm->name = 'menu_parent_product_display'; $strongarm->value = 'main-menu:0'; - $export['menu_parent_sample_product_display'] = $strongarm; + $export['menu_parent_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'node_options_sample_product_display'; + $strongarm->name = 'node_options_product_display'; $strongarm->value = array( 0 => 'status', ); - $export['node_options_sample_product_display'] = $strongarm; + $export['node_options_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'node_preview_sample_product_display'; + $strongarm->name = 'node_preview_product_display'; $strongarm->value = '1'; - $export['node_preview_sample_product_display'] = $strongarm; + $export['node_preview_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'node_submitted_sample_product_display'; + $strongarm->name = 'node_submitted_product_display'; $strongarm->value = 1; - $export['node_submitted_sample_product_display'] = $strongarm; + $export['node_submitted_product_display'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.facetapi_defaults.inc b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.facetapi_defaults.inc index 28ae8b1..1ed07b6 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.facetapi_defaults.inc +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.facetapi_defaults.inc @@ -13,10 +13,10 @@ function commerce_kickstart_lite_product_ui_facetapi_default_facet_settings() { $facet = new stdClass(); $facet->disabled = FALSE; /* Edit this to true to make a default facet disabled initially */ $facet->api_version = 1; - $facet->name = 'search_api@kickstart_sample_product_display:block:field_product_variations:field_sample_color'; - $facet->searcher = 'search_api@kickstart_sample_product_display'; + $facet->name = 'search_api@kickstart_product_display:block:field_product_variations:field_color'; + $facet->searcher = 'search_api@kickstart_product_display'; $facet->realm = 'block'; - $facet->facet = 'field_product_variations:field_sample_color'; + $facet->facet = 'field_product_variations:field_color'; $facet->enabled = TRUE; $facet->settings = array( 'weight' => 0, @@ -42,15 +42,15 @@ function commerce_kickstart_lite_product_ui_facetapi_default_facet_settings() { 'nofollow' => 1, 'show_expanded' => 0, ); - $export['search_api@kickstart_sample_product_display:block:field_product_variations:field_sample_color'] = $facet; + $export['search_api@kickstart_product_display:block:field_product_variations:field_color'] = $facet; $facet = new stdClass(); $facet->disabled = FALSE; /* Edit this to true to make a default facet disabled initially */ $facet->api_version = 1; - $facet->name = 'search_api@kickstart_sample_product_display:block:field_product_variations:field_sample_size'; - $facet->searcher = 'search_api@kickstart_sample_product_display'; + $facet->name = 'search_api@kickstart_product_display:block:field_product_variations:field_size'; + $facet->searcher = 'search_api@kickstart_product_display'; $facet->realm = 'block'; - $facet->facet = 'field_product_variations:field_sample_size'; + $facet->facet = 'field_product_variations:field_size'; $facet->enabled = TRUE; $facet->settings = array( 'weight' => 0, @@ -76,7 +76,7 @@ function commerce_kickstart_lite_product_ui_facetapi_default_facet_settings() { 'nofollow' => 1, 'show_expanded' => 0, ); - $export['search_api@kickstart_sample_product_display:block:field_product_variations:field_sample_size'] = $facet; + $export['search_api@kickstart_product_display:block:field_product_variations:field_size'] = $facet; return $export; } diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.info b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.info index ebb8956..d3f2444 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.info +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.info @@ -32,8 +32,8 @@ features[ctools][] = current_search:current_search:1 features[ctools][] = facetapi:facetapi_defaults:1 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 -features[facetapi][] = search_api@kickstart_sample_product_display:block:field_product_variations:field_sample_color -features[facetapi][] = search_api@kickstart_sample_product_display:block:field_product_variations:field_sample_size +features[facetapi][] = search_api@kickstart_product_display:block:field_product_variations:field_color +features[facetapi][] = search_api@kickstart_product_display:block:field_product_variations:field_size features[features_api][] = api:1 features[menu_custom][] = main-menu features[variable][] = taxonomy_breadcrumb_home @@ -44,5 +44,5 @@ features[variable][] = taxonomy_breadcrumb_selected_vid features[variable][] = taxonomy_breadcrumb_show_current_term features[views_view][] = collection_taxonomy_term features[views_view][] = confirm_message_product_display -features[views_view][] = sample_display_products +features[views_view][] = display_products features[views_view][] = shopping_cart diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.install b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.install index 64064e7..695c36d 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.install +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.install @@ -91,7 +91,7 @@ function commerce_kickstart_lite_product_ui_enable() { // Fill menus // Set up taxonomy main menu. - $collection = taxonomy_vocabulary_machine_name_load('sample_product_category'); + $collection = taxonomy_vocabulary_machine_name_load('product_category'); $variable_name = _taxonomy_menu_build_variable('vocab_menu', $collection->vid); variable_set($variable_name, 'main-menu'); diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.views_default.inc b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.views_default.inc index f92997e..1c4292f 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.views_default.inc +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_ui/commerce_kickstart_lite_product_ui.views_default.inc @@ -91,7 +91,7 @@ function commerce_kickstart_lite_product_ui_views_default_views() { $handler->display->display_options['arguments']['term_node_tid_depth']['specify_validation'] = 1; $handler->display->display_options['arguments']['term_node_tid_depth']['validate']['type'] = 'taxonomy_term'; $handler->display->display_options['arguments']['term_node_tid_depth']['validate_options']['vocabularies'] = array( - 'sample_product_category' => 'sample_product_category', + 'product_category' => 'product_category', ); $handler->display->display_options['arguments']['term_node_tid_depth']['validate_options']['transform'] = '1'; $handler->display->display_options['arguments']['term_node_tid_depth']['depth'] = '0'; @@ -375,7 +375,7 @@ function commerce_kickstart_lite_product_ui_views_default_views() { $handler->display->display_options['fields']['field_extractor_field_product_variations']['hide_empty'] = 0; $handler->display->display_options['fields']['field_extractor_field_product_variations']['empty_zero'] = 0; $handler->display->display_options['fields']['field_extractor_field_product_variations']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['field_extractor_field_product_variations']['field_name'] = 'field_sample_color'; + $handler->display->display_options['fields']['field_extractor_field_product_variations']['field_name'] = 'field_color'; $handler->display->display_options['fields']['field_extractor_field_product_variations']['formatter'] = 'entityreference_entity_view'; $handler->display->display_options['fields']['field_extractor_field_product_variations']['settings'] = array( 'view_mode' => 'add_to_cart_form', @@ -511,10 +511,10 @@ function commerce_kickstart_lite_product_ui_views_default_views() { $export['confirm_message_product_display'] = $view; $view = new view; - $view->name = 'sample_display_products'; + $view->name = 'display_products'; $view->description = 'Display all the products that are available, using Search API'; $view->tag = 'default'; - $view->base_table = 'search_api_index_kickstart_sample_product_display'; + $view->base_table = 'search_api_index_kickstart_product_display'; $view->human_name = 'Display products'; $view->core = 7; $view->api_version = '3.0'; @@ -534,7 +534,7 @@ function commerce_kickstart_lite_product_ui_views_default_views() { $handler->display->display_options['row_options']['view_mode'] = 'product_list'; /* Field: Indexed Node: Node ID */ $handler->display->display_options['fields']['nid']['id'] = 'nid'; - $handler->display->display_options['fields']['nid']['table'] = 'search_api_index_kickstart_sample_product_display'; + $handler->display->display_options['fields']['nid']['table'] = 'search_api_index_kickstart_product_display'; $handler->display->display_options['fields']['nid']['field'] = 'nid'; /* Display: Page */ diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_zoom/commerce_kickstart_lite_product_zoom.info b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_zoom/commerce_kickstart_lite_product_zoom.info index e1c0e60..a9b3ab6 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_zoom/commerce_kickstart_lite_product_zoom.info +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_zoom/commerce_kickstart_lite_product_zoom.info @@ -1,5 +1,5 @@ name = Commerce Kickstart Lite Product Zoom -description = Enable the cloud zoom functionnality for the image field attached to the sample product. +description = Enable the cloud zoom functionality for product images. core = 7.x package = Commerce Kickstart php = 5.2.4 diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_zoom/commerce_kickstart_lite_product_zoom.install b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_zoom/commerce_kickstart_lite_product_zoom.install index 19a8f79..28a09d6 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_zoom/commerce_kickstart_lite_product_zoom.install +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_product_zoom/commerce_kickstart_lite_product_zoom.install @@ -38,12 +38,12 @@ function commerce_kickstart_lite_product_zoom_enable() { $instance = array( 'entity_type' => 'commerce_product', - 'bundle' => 'sample_product', - 'field_name' => 'field_sample_images', + 'bundle' => 'product', + 'field_name' => 'field_images', 'display' => array('default' => $settings ), ); - $field_instance = field_read_instance('commerce_product', 'field_sample_images', 'sample_product'); + $field_instance = field_read_instance('commerce_product', 'field_images', 'product'); $field_settings = $field_instance['display']['default']; variable_set('commerce_kickstart_lite_zoom_settings', $field_settings); field_update_instance($instance); @@ -53,8 +53,8 @@ function commerce_kickstart_lite_product_zoom_disable() { if ($field_restore = variable_get('commerce_kickstart_lite_zoom_settings', NULL)) { $instance = array( 'entity_type' => 'commerce_product', - 'bundle' => 'sample_product', - 'field_name' => 'field_sample_images', + 'bundle' => 'product', + 'field_name' => 'field_images', 'display' => array( 'default' => $field_restore ), diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_search/commerce_kickstart_lite_search.features.inc b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_search/commerce_kickstart_lite_search.features.inc index c261f21..6e9a39e 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_search/commerce_kickstart_lite_search.features.inc +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_search/commerce_kickstart_lite_search.features.inc @@ -9,37 +9,37 @@ */ function commerce_kickstart_lite_search_default_search_api_server() { $items = array(); - $items['kickstart_sample_product_display'] = entity_import('search_api_server', '{ - "name" : "Kickstart_sample_product_display", - "machine_name" : "kickstart_sample_product_display", + $items['kickstart_product_display'] = entity_import('search_api_server', '{ + "name" : "Kickstart_product_display", + "machine_name" : "kickstart_product_display", "description" : "", "class" : "search_api_db_service", "options" : { "database" : "default:default", "min_chars" : "1", - "indexes" : { "kickstart_sample_product_display" : { + "indexes" : { "kickstart_product_display" : { "title" : { - "table" : "search_api_db_kickstart_sample_product_display_title", + "table" : "search_api_db_kickstart_product_display_title", "type" : "text", "boost" : "1.0" }, "search_api_language" : { - "table" : "search_api_db_kickstart_sample_product_display_search_api_langu", + "table" : "search_api_db_kickstart_product_display_search_api_langu", "type" : "string", "boost" : "1.0" }, "field_product_variations:title" : { - "table" : "search_api_db_kickstart_sample_product_display_field_product_va", + "table" : "search_api_db_kickstart_product_display_field_product_va", "type" : "list\\u003Ctext\\u003E", "boost" : "1.0" }, - "field_product_variations:field_sample_color" : { - "table" : "search_api_db_kickstart_sample_product_display_field_product__1", + "field_product_variations:field_color" : { + "table" : "search_api_db_kickstart_product_display_field_product__1", "type" : "list\\u003Cinteger\\u003E", "boost" : "1.0" }, - "field_product_variations:field_sample_size" : { - "table" : "search_api_db_kickstart_sample_product_display_field_product__2", + "field_product_variations:field_size" : { + "table" : "search_api_db_kickstart_product_display_field_product__2", "type" : "list\\u003Cinteger\\u003E", "boost" : "1.0" } diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_search/commerce_kickstart_lite_search.info b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_search/commerce_kickstart_lite_search.info index 7445f32..3226589 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_search/commerce_kickstart_lite_search.info +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_lite_search/commerce_kickstart_lite_search.info @@ -13,6 +13,6 @@ dependencies[] = search_api_ranges dependencies[] = search_api_sorts dependencies[] = search_api_views features[features_api][] = api:1 -features[search_api_server][] = kickstart_sample_product_display +features[search_api_server][] = kickstart_product_display files[] = plugins/facetapi/filter_kickstart_same_search.inc files[] = plugins/facetapi/filter_kickstart_search_start.inc diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_product_ui/theme/node--product--type--product--list.tpl.php b/modules/commerce_kickstart/demo_content/commerce_kickstart_product_ui/theme/node--product--type--product--list.tpl.php index 6f05eb7..e3dd70f 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_product_ui/theme/node--product--type--product--list.tpl.php +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_product_ui/theme/node--product--type--product--list.tpl.php @@ -13,7 +13,7 @@ print render($content); ?> - +
diff --git a/modules/commerce_kickstart/demo_content/commerce_kickstart_product_ui/theme/node--product--type.tpl.php b/modules/commerce_kickstart/demo_content/commerce_kickstart_product_ui/theme/node--product--type.tpl.php index d08d2c0..bef4818 100644 --- a/modules/commerce_kickstart/demo_content/commerce_kickstart_product_ui/theme/node--product--type.tpl.php +++ b/modules/commerce_kickstart/demo_content/commerce_kickstart_product_ui/theme/node--product--type.tpl.php @@ -23,7 +23,7 @@ print render($content); ?>
- +
diff --git a/themes/commerce_kickstart_admin/commerce_kickstart_admin.css b/themes/commerce_kickstart_admin/commerce_kickstart_admin.css index de291fc..b17ecfb 100644 --- a/themes/commerce_kickstart_admin/commerce_kickstart_admin.css +++ b/themes/commerce_kickstart_admin/commerce_kickstart_admin.css @@ -67,10 +67,10 @@ body.in-maintenance ol.task-list li.done { background: transparent url("images/tasks-complete.png") no-repeat 0 0; color: #75cd27; } -body.in-maintenance .form-item-commerce-kickstart-example-content .form-radios { +body.in-maintenance .form-item-install-demo-store .form-radios { float: left; /* LTR */ } -body.in-maintenance .form-item-commerce-kickstart-example-content .description { +body.in-maintenance .form-item-install-demo-store .description { background: transparent url("images/small-pointer.png") no-repeat 0 3px; margin-left: 80px; /* LTR */ padding: 3px 5px 5px 23px; @@ -84,7 +84,7 @@ body.in-maintenance .password-strength { width: 15em; } -body.in-maintenance .form-item-commerce-kickstart-example-content-selection label[for=edit-commerce-kickstart-example-content-selection] { +body.in-maintenance .form-item-extras label[for=edit-extras] { clear: both; }