Commit Graph

434 Commits

Author SHA1 Message Date
Radu Ioan Fericean
9e88719e05 fixed build problem 2014-02-07 12:24:52 +02:00
Radu Ioan Fericean
3a3b92e9d6 little cleanup 2014-02-07 11:13:39 +02:00
Radu Ioan Fericean
a9d698e029 Merge branch 'master' into shared_balances
Conflicts:
	engine/balances.go
	engine/userbalance.go
2014-02-07 10:57:29 +02:00
Radu Ioan Fericean
aa99a1e526 make sure connect fee is deducted only on LoopIndex = 0 2014-02-06 19:36:42 +02:00
Radu Ioan Fericean
f154dac933 connect fee changes
The connect fee is take from the first timespan after balance debit.
So if the balance has ratingsubject than that connect fee will be applied.
2014-02-06 18:56:21 +02:00
Radu Ioan Fericean
59f650e3f8 small addition last night fix 2014-02-06 10:15:27 +02:00
Radu Ioan Fericean
462152a76d fixed rating with rating subject bug 2014-02-06 01:34:38 +02:00
Radu Ioan Fericean
3bf3f04cc6 removed connect fee as a separte field in call cost 2014-02-06 01:34:38 +02:00
Radu Ioan Fericean
77c326cccf action rating subject may or may not start with a * 2014-02-04 20:54:48 +02:00
Radu Ioan Fericean
58d485f46f small console fixes 2014-02-04 14:40:58 +02:00
DanB
4cbadb4158 Merge branch 'master' of https://github.com/cgrates/cgrates 2014-02-03 19:04:53 +01:00
DanB
caba3af732 Mediation RPC with rerate abilitites, rename RatedCDR -> StoredCdr, adding storage interface tests 2014-02-03 19:04:42 +01:00
Radu Ioan Fericean
727337e617 start shared groups cvs loading
modified shared group structure
2014-02-03 18:50:26 +02:00
Radu Ioan Fericean
20a0ae4449 removed direction and added destinationid to add_balance console command
th consoled is aimed to be used for simple and quick test actions
2014-02-03 17:34:37 +02:00
Radu Ioan Fericean
c7ea2cd263 miminmum match length is now parametrized and can be moved in the confs
Note that it affects the general speed
2014-02-03 10:53:32 +02:00
Radu Ioan Fericean
30a842a6b9 miminmum match length is now parametrized and can be moved in the confs
Note that it affects the general speed
2014-02-01 14:04:12 +02:00
Radu Ioan Fericean
6fcd794005 moved hist init before populate 2014-01-31 18:49:49 +02:00
Radu Ioan Fericean
d90e67b966 moved get next start date from shared balances branch 2014-01-31 17:07:36 +02:00
Radu Ioan Fericean
a239b8d760 bigger refactoring for next start date calculus 2014-01-31 16:37:48 +02:00
Radu Ioan Fericean
0490eaef8c split shared debiting methods minutes/money 2014-01-29 21:54:17 +02:00
Radu Ioan Fericean
ea6c8371d2 Merge branch 'master' into shared_balances 2014-01-29 21:45:05 +02:00
Radu Ioan Fericean
4032274748 fixed next start time test 2014-01-29 18:39:36 +02:00
Radu Ioan Fericean
31eebb7e81 Merge branch 'master' into shared_balances 2014-01-28 13:00:40 +02:00
Radu Ioan Fericean
5d190f0f2a add actions for enabling/disabling user 2014-01-28 13:00:04 +02:00
Radu Ioan Fericean
a5fad89574 added disabling facility for user accounts 2014-01-28 12:22:50 +02:00
Radu Ioan Fericean
69cf1cc896 Merge branch 'master' into shared_balances
Conflicts:
	apier/v1/apier_local_test.go
	apier/v1/tutfscsv_local_test.go
	cmd/cgr-engine/cgr-engine.go
	engine/storage_map.go
	engine/storage_mongo.go
	engine/storage_redis.go
2014-01-27 11:18:25 +02:00
Radu Ioan Fericean
b735688fe5 Remaned to hasdata method 2014-01-27 11:04:25 +02:00
DanB
1bbe5a0a88 CDRc communicating over internal interface with the CDRs 2014-01-25 20:52:32 +01:00
DanB
f61aca8d91 Merge branch 'master' of https://github.com/cgrates/cgrates 2014-01-25 14:03:18 +01:00
Radu Ioan Fericean
3bbb67c72f working variant for history server and gob enc 2014-01-25 11:52:11 +02:00
Radu Ioan Fericean
8177e64f8b new histtory tests 2014-01-25 11:52:11 +02:00
DanB
9210b20924 Fmt on sources :( 2014-01-25 10:49:00 +01:00
Radu Ioan Fericean
c50c202fe6 Merge branch 'master' into shared_balances
Conflicts:
	apier/v1/apier_local_test.go
	apier/v1/tutfscsv_local_test.go
	cmd/cgr-engine/cgr-engine.go
2014-01-24 10:26:55 +02:00
DanB
4f3e91d8ca Default client-server over internal connections, small fixup order of service start 2014-01-23 12:45:13 +01:00
DanB
f51e0b10e3 Merge branch 'master' of https://github.com/cgrates/cgrates 2014-01-23 10:51:03 +01:00
Radu Ioan Fericean
999ac0aead added server log messages 2014-01-23 11:44:14 +02:00
DanB
02297d4d36 Merge branch 'master' of https://github.com/cgrates/cgrates 2014-01-23 10:29:41 +01:00
DanB
95fde288ad Fixup mailer 2014-01-23 10:29:31 +01:00
Radu Ioan Fericean
ea75cd3aa2 cgr-engine main is async again 2014-01-23 11:25:32 +02:00
Radu Ioan Fericean
7697b74713 Merge branch 'master' into shared_balances
Conflicts:
	apier/v1/apier.go
	cmd/cgr-engine/cgr-engine.go
	engine/storage_redis.go
2014-01-23 10:26:29 +02:00
DanB
5e72e1c528 Adding mail_async action 2014-01-22 22:14:06 +01:00
Radu Ioan Fericean
0005ba2f68 RPC server changes
rpc server now serves both json and gob, refactored server code into
it's own type
2014-01-22 19:53:30 +02:00
DanB
08e5d8540a callUrlAsync using previous json encoded balance for error logging 2014-01-21 17:52:03 +01:00
DanB
6c96937059 Async call url logs failures 2014-01-21 13:31:53 +01:00
DanB
080395e7ea Adding async call_url action 2014-01-21 13:03:47 +01:00
DanB
2896053199 Renaming ActionsTimings into ActionPlan so we avoid in the future redis store changes as much as possible 2014-01-19 20:14:46 +01:00
DanB
0348be416c ActionTimings -> ActionPlan in APIs, storage tables and redis key 2014-01-19 20:02:32 +01:00
DanB
8ec403f151 Fixup reloading cache keys on csv/db load, removed automatic caching in db/set methods since it makes no sense/trouble in distributed environments 2014-01-18 19:45:23 +01:00
Radu Ioan Fericean
3c622d317a warning when duplicating timings 2014-01-15 17:45:39 +02:00
DanB
6c82f01a10 Tutorial rates fixup, apier reload cache after loading from file, init script creates rundir 2014-01-15 15:23:32 +01:00