lang->line('config_default_sales_discount'), 'default_sales_discount', array('class' => 'control-label col-xs-2 required')); ?>
+ config->item('giftcard_number') == 'series')
+ {
+ $class = ' required';
+ }
+ ?>
- lang->line('giftcards_giftcard_number'), 'name', array('class'=>'required control-label col-xs-3')); ?>
+ lang->line('giftcards_giftcard_number'), 'name', array('class'=>'control-label col-xs-3'.$class)); ?>
'giftcard_number',
@@ -69,13 +76,13 @@ $(document).ready(function()
var autocompleter = $("#person_name").autocomplete({
source: '',
- minChars: 0,
- delay: 15,
- cacheLength: 1,
+ minChars: 0,
+ delay: 15,
+ cacheLength: 1,
appendTo: '.modal-content',
select: fill_value,
focus: fill_value
- });
+ });
// declare submitHandler as an object.. will be reused
var submit_form = function() {
@@ -100,11 +107,13 @@ $(document).ready(function()
},
rules:
{
+ config->item('giftcard_number') == "series"){ ?>
giftcard_number:
- {
- required:true,
- number:true
- },
+ {
+ required:true,
+ number:true
+ },
+
value:
{
required:true,
@@ -113,11 +122,13 @@ $(document).ready(function()
},
messages:
{
+ config->item('giftcard_number') == "series"){ ?>
giftcard_number:
- {
- required:"lang->line('giftcards_number_required'); ?>",
- number:"lang->line('giftcards_number'); ?>"
- },
+ {
+ required:"lang->line('giftcards_number_required'); ?>",
+ number:"lang->line('giftcards_number'); ?>"
+ },
+
value:
{
required:"lang->line('giftcards_value_required'); ?>",
@@ -126,4 +137,4 @@ $(document).ready(function()
}
}, form_support.error));
});
-
\ No newline at end of file
+
diff --git a/database/3.0.2_to_3.1.0.sql b/database/3.0.2_to_3.1.0.sql
index ec9465759..fc07c4509 100644
--- a/database/3.0.2_to_3.1.0.sql
+++ b/database/3.0.2_to_3.1.0.sql
@@ -216,3 +216,11 @@ ALTER TABLE `ospos_people`
INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('financial_year','1');
+
+-- alter giftcard field number to be varchar
+
+ALTER TABLE `ospos_giftcards` CHANGE `giftcard_number` `giftcard_number` VARCHAR(255) NULL;
+
+-- add support for select between gitcard number series or random
+
+INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('giftcard_number', 'series');
\ No newline at end of file
diff --git a/database/database.sql b/database/database.sql
index 71c0699b7..f0564e9e5 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -94,7 +94,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('customer_reward_enable',''),
('default_origin_tax_code', ''),
('cash_decimals', '2'),
-('financial_year','1');
+('financial_year','1'),
+('giftcard_number', 'series');
-- --------------------------------------------------------
@@ -154,7 +155,7 @@ INSERT INTO `ospos_employees` (`username`, `password`, `person_id`, `deleted`, `
CREATE TABLE `ospos_giftcards` (
`record_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`giftcard_id` int(11) NOT NULL AUTO_INCREMENT,
- `giftcard_number` int(10) NOT NULL,
+ `giftcard_number` VARCHAR(255) NULL,
`value` decimal(15,2) NOT NULL,
`deleted` int(1) NOT NULL DEFAULT '0',
`person_id` INT(10) DEFAULT NULL,
diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql
index 0622dda35..8ace78db8 100644
--- a/database/migrate_phppos_dist.sql
+++ b/database/migrate_phppos_dist.sql
@@ -94,7 +94,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('customer_reward_enable',''),
('default_origin_tax_code', ''),
('cash_decimals', '2'),
-('financial_year','1');
+('financial_year','1'),
+('giftcard_number', 'series');
-- --------------------------------------------------------
@@ -154,7 +155,7 @@ INSERT INTO `ospos_employees` (`username`, `password`, `person_id`, `deleted`, `
CREATE TABLE `ospos_giftcards` (
`record_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`giftcard_id` int(11) NOT NULL AUTO_INCREMENT,
- `giftcard_number` int(10) NOT NULL,
+ `giftcard_number` VARCHAR(255) NULL,
`value` decimal(15,2) NOT NULL,
`deleted` int(1) NOT NULL DEFAULT '0',
`person_id` INT(10) DEFAULT NULL,
diff --git a/database/tables.sql b/database/tables.sql
index fe99ce183..0f007fe9a 100644
--- a/database/tables.sql
+++ b/database/tables.sql
@@ -94,7 +94,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('customer_reward_enable',''),
('default_origin_tax_code', ''),
('cash_decimals', '2'),
-('financial_year','1');
+('financial_year','1'),
+('giftcard_number', 'series');
-- --------------------------------------------------------
@@ -154,7 +155,7 @@ INSERT INTO `ospos_employees` (`username`, `password`, `person_id`, `deleted`, `
CREATE TABLE `ospos_giftcards` (
`record_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`giftcard_id` int(11) NOT NULL AUTO_INCREMENT,
- `giftcard_number` int(10) NOT NULL,
+ `giftcard_number` VARCHAR(255) NULL,
`value` decimal(15,2) NOT NULL,
`deleted` int(1) NOT NULL DEFAULT '0',
`person_id` INT(10) DEFAULT NULL,