diff -c uc_product_power_tools/uc_product_power_tools.install uc_product_power_tools.install *** uc_product_power_tools.install 2009-05-23 11:56:31.000000000 -0700 --- uc_product_power_tools.install 2009-09-24 13:52:45.000000000 -0700 *************** *** 65,70 **** --- 65,88 ---- 'default' => 0.0, ), + // sale-price Boolean on/off setting & default price + 'sell-price' => array( + 'description' => t('boolean'), + 'type' => 'int', + 'size' => 'tiny', + 'not null' => FALSE, + 'unsigned' => TRUE, + 'default' => 0, + ), + 'sell-price-settings' => array( + 'description' => t('default cost value'), + 'type' => 'numeric', + 'precision' => 15, + 'scale' => 3, + 'not null' => FALSE, + 'default' => 0.0, + ), + // Cost Boolean on/off setting & default price 'cost' => array( 'description' => t('boolean'), diff -c uc_product_power_tools.module uc_product_power_tools.module *** uc_product_power_tools.module 2009-05-23 11:56:31.000000000 -0700 --- uc_product_power_tools.module 2009-09-24 13:52:45.000000000 -0700 *************** *** 79,84 **** --- 79,93 ---- ); } + // Handle Sell Price field. + switch ($class_settings['sell-price']) { + case 1: + $form['base']['prices']['sell_price'] = array( + '#type' => 'hidden', + '#value' => $class_settings['sell-price-settings'], + ); + } + // Handle Cost field. switch ($class_settings['cost']) { case 1: *************** *** 156,162 **** $node->list_price = $node->sell_price; } ! if ($class_settings['asku'] == 1) { if (module_exists('token')) { $newsku = token_replace($class_settings['asku-settings'], 'node', $node); $node->model = $newsku; --- 165,171 ---- $node->list_price = $node->sell_price; } ! if ($class_settings['asku'] == 1) { if (module_exists('token')) { $newsku = token_replace($class_settings['asku-settings'], 'node', $node); $node->model = $newsku; diff -c uc_product_power_tools_admin.inc uc_product_power_tools_admin.inc *** uc_product_power_tools_admin.inc 2009-05-23 11:56:31.000000000 -0700 --- uc_product_power_tools_admin.inc 2009-09-24 13:52:45.000000000 -0700 *************** *** 15,21 **** $form = array(); $form['content'] = array( ! '#value' => t('

Product "Power Tools" give you a number of options for altering the product creation form. This is useful when you have product classes that do not require all of the possible product fields. Unneeded fields can be disabled and hidden, or preset and hidden.

Tweakable options:

'), ); $form['classes'] = array( '#type' => 'fieldset', --- 15,21 ---- $form = array(); $form['content'] = array( ! '#value' => t('

Product "Power Tools" give you a number of options for altering the product creation form. This is useful when you have product classes that do not require all of the possible product fields. Unneeded fields can be disabled and hidden, or preset and hidden.

Tweakable options:

'), ); $form['classes'] = array( '#type' => 'fieldset', *************** *** 178,183 **** --- 178,209 ---- '#field_prefix' => $sign_flag ? '' : $currency_sign, '#field_suffix' => $sign_flag ? $currency_sign : '', ); + $form['power_tools']['pricing']['sell_price'] = array( + '#type' => 'fieldset', + '#title' => 'Sell Price', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['power_tools']['pricing']['sell_price']['sell_priceonoff'] = array( + '#type' => 'radios', + '#default_value' => isset($data['sell_price']) ? $data['sell_price'] : 0, + '#options' => array( + t('Show Sell Price field on product entry form'), + t('Hide Sell Price field & Use default value below:'), + ) + ); + $form['power_tools']['pricing']['sell_price']['sell_price_settings'] = array( + '#type' => 'textfield', + '#size' => 32, + '#title' => t('Sell Price'), + '#required' => FALSE, + '#default_value' => isset($data['sell_price-settings']) ? $data['sell_price-settings'] : 0, + '#weight' => 0, + '#size' => 20, + '#maxlength' => 35, + '#field_prefix' => $sign_flag ? '' : $currency_sign, + '#field_suffix' => $sign_flag ? $currency_sign : '', + ); $form['power_tools']['pricing']['cost'] = array( '#type' => 'fieldset', '#title' => 'Cost', *************** *** 352,357 **** --- 378,385 ---- $askusettings = $form_state['values']['asku_pattern']; $lp = $form_state['values']['lponoff']; $lpsettings = $form_state['values']['lp_settings']; + $sell_price = $form_state['values']['sell_priceonoff']; + $sell_pricesettings = $form_state['values']['sell_price_settings']; $cost = $form_state['values']['costonoff']; $costsettings = $form_state['values']['cost_settings']; $dq = $form_state['values']['dqonoff']; *************** *** 366,372 **** $stockthreshold = $form_state['values']['stock_threshold']; db_query("DELETE FROM {uc_power_tools} WHERE pcid = '%s'", $pcid); ! db_query("INSERT INTO {uc_power_tools} (pcid, enabled, asku, `asku-settings`, lp, `lp-settings`, cost, `cost-settings`, dq, `dq-settings`, pq, `pq-settings`, ship, lpos, `lpos-settings`, stock, `stock-settings`, `stock-threshold`) VALUES ('%s', %d, %d, '%s', %d, %f, %d, %f, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", $pcid, $enabled, $asku, $askusettings, $lp, $lpsettings, $cost, $costsettings, $dq, $dqsettings, $pq, $pqsettings, $ship, $lpos, $lpossettings, $stock, $stocksettings, $stockthreshold); drupal_set_message('"Power Tools" settings saved.'); drupal_goto('admin/store/products/power-tools'); --- 394,400 ---- $stockthreshold = $form_state['values']['stock_threshold']; db_query("DELETE FROM {uc_power_tools} WHERE pcid = '%s'", $pcid); ! db_query("INSERT INTO {uc_power_tools} (pcid, enabled, asku, `asku-settings`, lp, `lp-settings`, `sell-price`, `sell-price-settings`, cost, `cost-settings`, dq, `dq-settings`, pq, `pq-settings`, ship, lpos, `lpos-settings`, stock, `stock-settings`, `stock-threshold`) VALUES ('%s', %d, %d, '%s', %d, %f, %d, %f, %d, %f, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", $pcid, $enabled, $asku, $askusettings, $lp, $lpsettings, $sell_price, $sell_pricesettings, $cost, $costsettings, $dq, $dqsettings, $pq, $pqsettings, $ship, $lpos, $lpossettings, $stock, $stocksettings, $stockthreshold); drupal_set_message('"Power Tools" settings saved.'); drupal_goto('admin/store/products/power-tools');