Commit Graph

55 Commits

Author SHA1 Message Date
Radu Ioan Fericean
9d0f252aad lcr load and torfield to categoryfield 2014-04-26 01:45:51 +03:00
Radu Ioan Fericean
393d9091b6 merge fixes 2014-04-25 22:35:43 +03:00
Radu Ioan Fericean
1d7d0b8078 Merge branch 'data' into lcr
Conflicts:
	apier/apier.go
	cmd/cgr-loader/cgr-loader.go
	engine/calldesc.go
	engine/loader_csv.go
	engine/loader_csv_test.go
	engine/storage_interface.go
	general_tests/ddazmbl1_test.go
	utils/apitpdata.go
2014-04-25 22:10:55 +03:00
Radu Ioan Fericean
48de7f3c30 Merge branch 'master' into refactor
Conflicts:
	sessionmanager/fssessionmanager.go
	sessionmanager/session.go
2014-04-25 21:42:48 +03:00
Radu Ioan Fericean
25cb5be8c0 refactor CallDuration in DurationIndex and TOR in Category 2014-04-25 21:16:21 +03:00
DanB
2a253892c5 Refactoring the code around derived charging to support integration with responder for internal requests, some of the copyright headers updated with new slogan 2014-04-23 20:48:43 +02:00
Radu Ioan Fericean
83b7034b7f Merge branch 'master' into console-ng 2014-04-19 16:33:59 +03:00
Radu Ioan Fericean
92d03eaf1a AddBalance expiration date accepting shortcuts 2014-04-19 12:37:22 +03:00
Radu Ioan Fericean
efc9240142 removed BalanceType from AttrGetAccount 2014-04-18 23:04:14 +03:00
DanB
94da5d9e74 Adding caching for DerivedCharging settings 2014-04-18 19:59:11 +02:00
DanB
43039b063b Updating after merge 2014-04-18 14:42:52 +02:00
DanB
668352b860 Initial DerivedCharging loading 2014-04-18 14:39:59 +02:00
Radu Ioan Fericean
adc7c3d671 add ResetTriggeredAction api call 2014-04-09 18:27:36 +03:00
Radu Ioan Fericean
d624af2e94 Merge branch 'master' into lcr 2014-04-07 13:33:09 +03:00
Radu Ioan Fericean
7313e64362 rename RateSubject to RatingSubject 2014-04-06 12:58:21 +03:00
Radu Ioan Fericean
ee6b1cd74f add lcr strategy 2014-03-25 21:38:18 +02:00
Radu Ioan Fericean
87481ed520 rename ActionTimings Tag and Id 2014-03-25 18:17:17 +02:00
DanB
5e06cafd2f Adding rating aliases, account aliases, shared groups to cache stats struct, improving fs_json tutorial tests and documentation 2014-03-22 16:50:25 +01:00
DanB
3892d9ed20 LoadTariffPlanFromFolder, tutfscsv tests fixup 2014-03-18 14:09:09 +01:00
Radu Ioan Fericean
724ebdc039 split rating profile and account aliases 2014-03-17 21:28:25 +02:00
DanB
f2f46f8054 Adding GetCallCostLog API and console command 2014-03-16 19:51:30 +01:00
DanB
5083c7479d Adding re-cache in case of LoadRatingProfile also 2014-03-13 17:35:49 +01:00
DanB
37b21d2bb5 Fixup re-cache in case of SetRatingProfile api 2014-03-13 17:01:02 +01:00
DanB
5b10f63c94 Reload cache on SetRatingProfile API 2014-03-05 19:10:27 +01:00
Radu Ioan Fericean
074313b0f8 first aliases implementation
tests pending
2014-02-26 18:29:49 +02:00
DanB
1a8e7f4631 Testing tutfscsv including maxDebit and unitsCounter for general usage 2014-02-25 20:52:11 +01:00
Radu Ioan Fericean
0aa5223f78 Merge branch 'master' into shared_balances
Conflicts:
	engine/account.go
	engine/loader_csv_test.go
	engine/storage_interface.go
	engine/storage_map.go
	engine/storage_redis.go
2014-02-21 16:36:48 +02:00
Radu Ioan Fericean
7831a53797 renamed USerBalance to Account 2014-02-21 14:37:31 +02:00
Radu Ioan Fericean
f701a42948 renamed action's BalanceId to BalanceType
also added a topup test
2014-02-21 13:14:06 +02:00
Radu Ioan Fericean
5f1923d694 Merge branch 'master' into shared_balances 2014-02-18 15:38:03 +02:00
Radu Ioan Fericean
c52b161b73 allow seetting rate subject and expiration with AddBalance api 2014-02-18 15:37:03 +02:00
Radu Ioan Fericean
c447fa49dc Merge branch 'master' into shared_balances 2014-02-12 14:18:03 +02:00
DanB
944262ccff Adding local_test for mediator rpc method 2014-02-10 18:31:27 +01:00
Radu Ioan Fericean
fc1e7aed5a merged master 2014-02-10 15:12:01 +02:00
DanB
b91fc4ca21 Adding mediator_rpc 2014-02-10 14:08:24 +01:00
Radu Ioan Fericean
52afbd376e added versioning for api and two new console commands: get_destination and add_balance (also improved set_balance) 2013-08-05 16:33:47 +03:00
Radu Ioan Fericean
6c79fd2092 rater lib changed to engine 2013-07-24 13:38:45 +03:00
Radu Ioan Fericean
2805190f45 small management api improvements 2013-07-22 13:54:30 +03:00
DanB
eb906ed87a Fixup 2013-07-20 22:15:20 +02:00
DanB
081ddce3f3 Formatting SetAccountActions api documentation 2013-07-20 22:05:19 +02:00
DanB
06fef1536c SetAccountActions API fixups 2013-07-20 18:34:37 +02:00
Radu Ioan Fericean
210f290e67 SetAccountAction API and filter for RESET_TRIGGERS 2013-07-19 20:06:42 +03:00
Radu Ioan Fericean
6c8d2c7187 improved expiration time 2013-07-19 20:06:41 +03:00
DanB
0a3adf326e Adding SetTPAction api method 2013-07-17 19:37:48 +02:00
DanB
c0881d977d Adding GetDestination api back 2013-07-17 14:55:30 +02:00
DanB
09f5db1a31 Fixup doc 2013-07-17 14:41:21 +02:00
DanB
5ba6c6ccc9 Merge branch 'master' of https://github.com/cgrates/cgrates 2013-07-16 21:18:23 +02:00
DanB
ebbadb50dd Apier.SetRatingProfile method fixups 2013-07-16 21:18:08 +02:00
Radu Ioan Fericean
b6bfc1745c expiration balances and minute buckets 2013-07-15 21:06:14 +03:00
Radu Ioan Fericean
34bc6107ea use rating profile id for loading from storedb 2013-07-12 12:23:56 +03:00