mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-14 03:50:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adding of decimal unit field

Browse Source
This commit is contained in:
objecttothis
2019-03-06 15:42:04 +04:00
parent d79783f605
commit 74995a5ac1
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Attributes.php
View File

@@ -71,6 +71,7 @@ class Attributes extends Secure_Controller
//Save definition data
$definition_data = array(
'definition_name' => $this->input->post('definition_name'),
'definition_unit' => $this->input->post('definition_unit') != '' ? $this->input->post('definition_unit') : NULL,
'definition_flags' => $definition_flags,
'definition_fk' => $this->input->post('definition_group') != '' ? $this->input->post('definition_group') : NULL
);

1
application/language/en-US/attributes_lang.php
View File

@@ -14,6 +14,7 @@ $lang["attributes_definition_successful_deleted"] = "You have successfully delet
$lang["attributes_definition_successful_updating"] = "You have successfully updated attribute";
$lang["attributes_definition_type"] = "Attribute Type";
$lang["attributes_definition_type_required"] = "Attribute type is a required field";
$lang["attributes_definition_unit"] = "Measurement Unit";
$lang["attributes_definition_values"] = "Attribute Values";
$lang["attributes_definition_error_adding_updating"] = "Attribute %1 could not be added or updated. Please check the error log.";
$lang["attributes_new"] = "New Attribute";

3
application/migrations/sqlscripts/3.4.0_decimal_attribute_type.sql
View File

@@ -1,2 +1,5 @@
ALTER TABLE ospos_attribute_values
ADD COLUMN attribute_decimal DECIMAL(7,3) DEFAULT NULL AFTER attribute_datetime;
ALTER TABLE ospos_attribute_definitions
ADD COLUMN definition_unit VARCHAR(16) DEFAULT NULL AFTER definition_type;

11
application/views/attributes/form.php
View File

@@ -39,6 +39,15 @@
</div>
</div>
<div class="form-group form-group-sm hidden">
<?php echo form_label($this->lang->line('attributes_definition_unit'), 'definition_units', array('class' => 'control-label col-xs-3')); ?>
<div class='col-xs-8'>
<div class="input-group">
<?php echo form_input(array('name'=>'definition_unit', 'value'=>$definition_info->definition_unit,'class'=>'form-control input-sm', 'id' => 'definition_unit'));?>
</div>
</div>
</div>
<div class="form-group form-group-sm hidden">
<?php echo form_label($this->lang->line('attributes_definition_values'), 'definition_value', array('class' => 'control-label col-xs-3')); ?>
<div class='col-xs-8'>
@@ -93,9 +102,11 @@ $(document).ready(function()
var show_hide_fields = function(event)
{
var is_dropdown = $('#definition_type').val() !== '1';
var is_decimal = $('#definition_type').val() !== '2';
var is_no_group = $('#definition_type').val() !== '0';
$('#definition_value, #definition_list_group').parents('.form-group').toggleClass('hidden', is_dropdown);
$('#definition_unit').parents('.form-group').toggleClass('hidden', is_decimal);
$('#definition_flags').parents('.form-group').toggleClass('hidden', !is_no_group);
};