diff --git a/includes/addressfields.inc b/includes/addressfields.inc
index 1885aeb..c488a86 100644
--- a/includes/addressfields.inc
+++ b/includes/addressfields.inc
@@ -271,8 +271,8 @@ function uc_extra_fields_pane_uc_checkout_pane_address($type, $op, $arg1, $arg2)
$generated_field = $field->generate();
switch ($field->value_type) {
- case UCXF_WIDGET_TYPE_PHP:
- case UCXF_WIDGET_TYPE_CONSTANT:
+ case ucxf_field::UCXF_WIDGET_TYPE_PHP:
+ case ucxf_field::UCXF_WIDGET_TYPE_CONSTANT:
break;
default:
// Adding default value for every field except for php and constant
@@ -355,22 +355,30 @@ function uc_extra_fields_pane_uc_checkout_pane_address($type, $op, $arg1, $arg2)
foreach ($fields as $field) {
// Only display if the field is enabled and if it may be displayed.
if ($field->enabled == 1 && $field->may_display('review')) {
- // Display it as data, unless its a checkbox
- if ($field->value_type == UCXF_WIDGET_TYPE_PHP_CHECKBOXES ||
- $field->value_type == UCXF_WIDGET_TYPE_CHECKBOXES ) {
- //TODO: need a way of displaying this checkbox info
- }
- else {
+ // get field name
$order_field_name = $field->db_name . '_' . $type;
+ // initialize field contents
+ $field_contents = '';
+
+ switch($field->value_type) {
+ case ucxf_field::UCXF_WIDGET_TYPE_CHECKBOX:
+ $field_contents = $arg1->extra_fields[$order_field_name] == 1 ? t('Yes') : t('No');
+ break;
+
+ default:
+ $field_contents = $arg1->extra_fields[$order_field_name] ? ' ' . $arg1->extra_fields[$order_field_name] : t("n/a");
+ break;
+ }
+
$review2[] = array(
'title' => $field->output('label'),
- 'data' => $arg1->extra_fields[$order_field_name] ? ' ' . $arg1->extra_fields[$order_field_name] : t("n/a")
+ 'data' => $field_contents,
);
- }
}
}
}
+
$review = array_merge($review, $review2);
return $review;
break;
@@ -461,4 +469,4 @@ function uc_extra_fields_pane_addressfields_user_register_form_alter(&$form, $fo
foreach ($fields as $fieldname => $field) {
$form[0][$fieldname] = $field->generate();
}
-}
\ No newline at end of file
+}
diff --git a/includes/checkout_pane.inc b/includes/checkout_pane.inc
index e129bf4..e9e43ec 100644
--- a/includes/checkout_pane.inc
+++ b/includes/checkout_pane.inc
@@ -67,9 +67,11 @@ function uc_extra_fields_pane_load_pane_type($op, &$arg1 = NULL, $arg2 = NULL, $
if (count($fields)) {
foreach ($fields as $field) {
// Display it as data, unless its a checkbox
- if ($field->value_type == UCXF_WIDGET_TYPE_PHP_CHECKBOXES ||
- $field->value_type == UCXF_WIDGET_TYPE_CHECKBOXES ) {
- // TODO: need a way of displaying this checkbox info
+ if ($field->value_type == ucxf_field::UCXF_WIDGET_TYPE_CHECKBOX ) {
+ $review[] = array(
+ 'title' => $field->output('label'),
+ 'data' => ($arg1->extra_fields[$field->db_name] == 1) ? t('Yes') : t('No'),
+ );
}
elseif ($field->may_display('review')) {
// warning: user input --> check_plain
@@ -115,4 +117,4 @@ function theme_uc_extra_fields_pane_checkout_pane($form) {
}
return $output;
-}
\ No newline at end of file
+}
diff --git a/includes/order_pane.inc b/includes/order_pane.inc
index b81e9fc..9675cd7 100644
--- a/includes/order_pane.inc
+++ b/includes/order_pane.inc
@@ -70,11 +70,11 @@ function uc_extra_fields_pane_order_handler($op, $arg1, $arg2=NULL, $pane_type=N
case 'extra_delivery':
case 'extra_billing':
$order_field_name = $field->db_name . '_' . $addresstype;
- $generated_field['#default_value'] = isset($arg1->extra_fields[$order_field_name]) ? $arg1->extra_fields[$order_field_name] : NULL;
+ $generated_field['#default_value'] = isset($arg1->extra_fields[$order_field_name]) ? $arg1->extra_fields[$order_field_name] : NULL;
break;
default:
- $generated_field['#default_value'] = isset($arg1->extra_fields[$field->db_name]) ? $arg1->extra_fields[$field->db_name] : NULL;
+ $generated_field['#default_value'] = isset($arg1->extra_fields[$field->db_name]) ? $arg1->extra_fields[$field->db_name] : NULL;
break;
}
// On the order edit form, a generated field shouldn't be a hidden field.
@@ -123,7 +123,18 @@ function uc_extra_fields_pane_order_handler($op, $arg1, $arg2=NULL, $pane_type=N
if (isset($values[$field->db_name])) {
// Only display if it may be displayed
if ($field->may_display('order')) {
- $custom_order_fields[] = ''. t($field->label) .': '. check_plain($values[$field->db_name]['value']) .'
';
+
+ $field_contents = '';
+ switch($field->value_type) {
+ case ucxf_field::UCXF_WIDGET_TYPE_CHECKBOX:
+ $field_contents = $values[$field->db_name]['value'] == 1 ? t('Yes') : t('No');
+ break;
+
+ default:
+ $field_contents = $values[$field->db_name]['value'] ? ' ' . $values[$field->db_name]['value'] : t("n/a");
+ break;
+ }
+ $custom_order_fields[] = ''. t($field->label) .': '. check_plain($field_contents) .'
';
}
}
}
@@ -159,4 +170,4 @@ function theme_uc_extra_fields_pane_order_pane($form) {
$output .= '';
}
return $output;
-}
\ No newline at end of file
+}
diff --git a/includes/ucxf_field.class.php b/includes/ucxf_field.class.php
index a7cdf3e..d761a2d 100644
--- a/includes/ucxf_field.class.php
+++ b/includes/ucxf_field.class.php
@@ -13,10 +13,10 @@ class ucxf_field {
const UCXF_WIDGET_TYPE_SELECT = 1;
const UCXF_WIDGET_TYPE_CONSTANT = 2;
const UCXF_WIDGET_TYPE_PHP = 3;
- const UCXF_WIDGET_TYPE_CHECKBOXES = 4;
+ const UCXF_WIDGET_TYPE_CHECKBOX = 4;
const UCXF_WIDGET_TYPE_TEXTFIELD = 5;
const UCXF_WIDGET_TYPE_PHP_SELECT = 6;
- const UCXF_WIDGET_TYPE_PHP_CHECKBOXES = 7;
+
// -----------------------------------------------------------------------------
// PROPERTIES
@@ -279,11 +279,10 @@ class ucxf_field {
$value_type_options = array(
self::UCXF_WIDGET_TYPE_TEXTFIELD => t('Let the user input the data in a textbox. If you want a default value, put it in "value" field below.'),
self::UCXF_WIDGET_TYPE_SELECT => t('Let the user select from a list of options (enter one name|value per line).'),
- self::UCXF_WIDGET_TYPE_CHECKBOXES => t('Let the user select from checkboxes (enter one name|value per line).'),
+ self::UCXF_WIDGET_TYPE_CHECKBOX => t('Let the user select from a checkbox.'),
self::UCXF_WIDGET_TYPE_CONSTANT => t('Show a admin defined constant value, insert the value in the "value" section.'),
self::UCXF_WIDGET_TYPE_PHP => t('Set the value to the php code that returns a STRING (PHP-mode, experts only).'),
self::UCXF_WIDGET_TYPE_PHP_SELECT => t('Let the user select from a list of options from php code returning a ARRAY of key => value pairs. ie- return array(\'element1\' => \'somevalue1\',\'element2\' => \'somevalue2\') (PHP-mode, experts only).'),
- self::UCXF_WIDGET_TYPE_PHP_CHECKBOXES => t('Let the user select checkboxes from a list of options from php code returning a ARRAY of key => value pairs. ie- return array(\'element1\' => \'somevalue1\',\'element2\' => \'somevalue2\') (PHP-mode, experts only).'),
);
$form['ucxf']['value_type'] = array(
@@ -372,7 +371,7 @@ class ucxf_field {
form_set_error('ucxf][pane_type', t('Custom order field: you need to provide a pane-type for this extra field.'));
}
if (!$field['value_type']) {
- form_set_error('ucxf][value_type', t('Custom order field: you need to provide a way of processing the value for this field as either textbox, select, checkboxes, constant, or php.'));
+ form_set_error('ucxf][value_type', t('Custom order field: you need to provide a way of processing the value for this field as either textbox, select, constant, or php.'));
}
if (($field['value_type'] == self::UCXF_WIDGET_TYPE_CONSTANT || $field['value_type'] == self::UCXF_WIDGET_TYPE_PHP) && !$field['value'] ) {
form_set_error('ucxf][value', t('Custom order field: you need to provide a value for this way of calculating the field value.'));
@@ -443,12 +442,18 @@ class ucxf_field {
);
break;
- case self::UCXF_WIDGET_TYPE_SELECT:
- case self::UCXF_WIDGET_TYPE_CHECKBOXES:
- $type = ($this->value_type == self::UCXF_WIDGET_TYPE_SELECT)? 'select' : 'checkboxes';
+ case self::UCXF_WIDGET_TYPE_CHECKBOX:
+ $return_field = array(
+ '#type' => 'checkbox',
+ '#title' => $this->output('label'),
+ '#description' => $this->output('description'),
+ '#required' => $this->required,
+ );
+ break;
+ case self::UCXF_WIDGET_TYPE_SELECT:
$return_field = array(
- '#type' => $type,
+ '#type' => 'select',
'#title' => $this->output('label'),
'#description' => $this->output('description'),
'#required' => $this->required,
@@ -465,12 +470,9 @@ class ucxf_field {
);
break;
case self::UCXF_WIDGET_TYPE_PHP_SELECT:
- case self::UCXF_WIDGET_TYPE_PHP_CHECKBOXES:
- // Displays php-defined select/checkboxes
- $type = ($this->value_type == self::UCXF_WIDGET_TYPE_PHP_SELECT) ? 'select' : 'checkboxes';
$return_field = array(
- '#type' => $type,
+ '#type' => 'select',
'#title' => $this->output('label'),
'#description' => $this->output('description'),
'#required' => $this->required,
@@ -497,7 +499,7 @@ class ucxf_field {
return $this->value;
case self::UCXF_WIDGET_TYPE_SELECT:
- case self::UCXF_WIDGET_TYPE_CHECKBOXES:
+
// This will return an array of options
// like array('value' => 'value', 'value2' => 'value2')
$options = array();
@@ -519,7 +521,6 @@ class ucxf_field {
return drupal_eval($this->value);
case self::UCXF_WIDGET_TYPE_PHP_SELECT:
- case self::UCXF_WIDGET_TYPE_PHP_CHECKBOXES:
// This will return an array of options created with eval
// like array('name' => 'value', 'name2' => 'value2')
// unfortunately drupal_eval() is not equipped for the task,
@@ -527,4 +528,4 @@ class ucxf_field {
return eval('?>' . $this->value);
}
}
-}
\ No newline at end of file
+}
diff --git a/views/uc_extra_fields_pane.views.inc b/views/uc_extra_fields_pane.views.inc
index 47f3bba..1ca416c 100644
--- a/views/uc_extra_fields_pane.views.inc
+++ b/views/uc_extra_fields_pane.views.inc
@@ -156,9 +156,24 @@ function uc_extra_fields_pane_views_fetch_field($field) {
// Add fields specific to the uc_extra_fields_pane type.
switch ($field->value_type) {
- case ucxf_field::UCXF_WIDGET_TYPE_CHECKBOXES:
- case ucxf_field::UCXF_WIDGET_TYPE_PHP_CHECKBOXES:
- // Not yet implemented
+ case ucxf_field::UCXF_WIDGET_TYPE_CHECKBOX:
+ if (!$data['help']) {
+ $data['help'] = t('Extra Fields Pane checkbox');
+ }
+ $data += array(
+ 'field' => array(
+ 'handler' => 'views_handler_field_boolean',
+ 'click sortable' => TRUE,
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort',
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_boolean_operator',
+ 'label' => t('Checked'),
+ 'type' => 'yes-no',
+ ),
+ );
break;
case ucxf_field::UCXF_WIDGET_TYPE_SELECT:
@@ -224,4 +239,4 @@ function uc_extra_fields_pane_views_handlers() {
),
),
);
-}
\ No newline at end of file
+}