diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql index 9afbb9903..ad856e266 100644 --- a/data/storage/mysql/create_tariffplan_tables.sql +++ b/data/storage/mysql/create_tariffplan_tables.sql @@ -549,7 +549,6 @@ CREATE TABLE tp_account_profiles ( `balance_id` varchar(64) NOT NULL, `balance_filter_ids` varchar(64) NOT NULL, `balance_weights` decimal(8,2) NOT NULL, - `balance_blocker` BOOLEAN NOT NULL, `balance_type` varchar(64) NOT NULL, `balance_units` decimal(16,4) NOT NULL, `balance_unit_factors` varchar(64) NOT NULL, diff --git a/data/storage/postgres/create_tariffplan_tables.sql b/data/storage/postgres/create_tariffplan_tables.sql index ae6532294..a7447b8db 100644 --- a/data/storage/postgres/create_tariffplan_tables.sql +++ b/data/storage/postgres/create_tariffplan_tables.sql @@ -532,7 +532,6 @@ CREATE TABLE tp_account_profiles ( "balance_id" varchar(64) NOT NULL, "balance_filter_ids" varchar(64) NOT NULL, "balance_weights" decimal(8,2) NOT NULL, - "balance_blocker" BOOLEAN NOT NULL, "balance_type" varchar(64) NOT NULL, "balance_units" decimal(16,4) NOT NULL, "balance_unit_factors" varchar(64) NOT NULL, diff --git a/data/tariffplans/testit/AccountProfiles.csv b/data/tariffplans/testit/AccountProfiles.csv index d6947c49a..287674eb0 100644 --- a/data/tariffplans/testit/AccountProfiles.csv +++ b/data/tariffplans/testit/AccountProfiles.csv @@ -1,3 +1,3 @@ -#Tenant,ID,FilterIDs,ActivationInterval,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceBlocker,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs -cgrates.org,ACC_PRF_1,,,;20,,MonetaryBalance,,;10,,*monetary,14,fltr1&fltr2;100;fltr3;200,,fltr1&fltr2;1.3;2.3;3.3,attr1;attr2,,*none -cgrates.org,1001,,,,,VoiceBalance,,;10,,*voice,3600000000000,,,,,, \ No newline at end of file +#Tenant,ID,FilterIDs,ActivationInterval,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs +cgrates.org,ACC_PRF_1,,,;20,,MonetaryBalance,,;10,*monetary,14,fltr1&fltr2;100;fltr3;200,,fltr1&fltr2;1.3;2.3;3.3,attr1;attr2,,*none +cgrates.org,1001,,,,,VoiceBalance,,;10,*voice,3600000000000,,,,,, \ No newline at end of file diff --git a/data/tariffplans/tutaccounts/AccountProfiles.csv b/data/tariffplans/tutaccounts/AccountProfiles.csv index 81ee2e41f..d1534754d 100644 --- a/data/tariffplans/tutaccounts/AccountProfiles.csv +++ b/data/tariffplans/tutaccounts/AccountProfiles.csv @@ -1,5 +1,5 @@ -#Tenant,ID,FilterIDs,ActivationInterval,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceBlocker,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs -cgrates.org,1001,*string:~*req.Account:1001,,,,MonetaryBalance1,,;30,,*concrete,5,,,*string:~*req.ToR:*voice;1000000000;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,,*none -cgrates.org,1001,,,,,GenericBalance1,,;20,,*abstract,3600000000000,*string:~*req.ToR:*data;1.024,,*string:~*req.ToR:*voice;1000000000;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,, -cgrates.org,1001,,,,,MonetaryBalance2,,;10,,*concrete,3,,,*string:~*req.ToR:*voice;1000000000;0;1,,, -cgrates.org,1002,*string:~*req.Account:1002,,;10,,MonetaryBalance1,,,,*concrete,10,,,*string:~*req.ToR:*voice;1000000000;0;0.01;;1;0;1,,,*none +#Tenant,ID,FilterIDs,ActivationInterval,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs +cgrates.org,1001,*string:~*req.Account:1001,,,,MonetaryBalance1,,;30,*concrete,5,,,*string:~*req.ToR:*voice;1000000000;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,,*none +cgrates.org,1001,,,,,GenericBalance1,,;20,*abstract,3600000000000,*string:~*req.ToR:*data;1.024,,*string:~*req.ToR:*voice;1000000000;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,, +cgrates.org,1001,,,,,MonetaryBalance2,,;10,*concrete,3,,,*string:~*req.ToR:*voice;1000000000;0;1,,, +cgrates.org,1002,*string:~*req.Account:1002,,;10,,MonetaryBalance1,,,*concrete,10,,,*string:~*req.ToR:*voice;1000000000;0;0.01;;1;0;1,,,*none