etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,538 Commits 323 Branches 325 Tags 836 MiB
Commit Graph

25538 Commits

Author SHA1 Message Date
Rohit Yadav b2dd5e1374 quota: fix ui to grab currency from the response 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-29 11:45:31 +05:30
Rohit Yadav def9e90956 quota: add currency to list/readonly apis 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-29 11:35:12 +05:30
Rohit Yadav 7b562b0696 quota: add new template for sending unlocked email account 2015-07-29 11:26:59 +05:30
Rohit Yadav 70aada690b quota: don't lock account, only unlock with adding credits 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-29 11:26:59 +05:30
Abhinandan Prateek e4125a2999 quota: allow locked accounts to be credited 2015-07-29 11:25:52 +05:30
Abhinandan Prateek 7a6b536d4b quota: only add the initial credit entries to the balance as they have 
not yet been accounted for
 2015-07-29 09:58:34 +05:30
Rohit Yadav 9e3dadce41 quota: unlock/lock logic with addCredits api 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 17:18:42 +05:30
Rohit Yadav a4e8301941 quota ui: grab current date in the browser's tariff 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 17:10:23 +05:30
Abhinandan Prateek 7a55e82563 quota: get last balance api 2015-07-28 16:15:11 +05:30
Rohit Yadav b001bf6dbc quota: for checking/sending email use the new lastQuotaBalance method to get latest balance 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 16:13:28 +05:30
Rohit Yadav 19fefbcbd1 quota: on getting enough credits, unlock the account which got new credits 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 16:12:55 +05:30
Rohit Yadav d29a4e9646 quota: only lock normal accounts 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 15:54:15 +05:30
Abhinandan Prateek b388512191 quota: rename method to lastQuotaBalance 2015-07-28 15:37:18 +05:30
Abhinandan Prateek ca6dfc99ac quota: added a method to get the last balance in balancedao 2015-07-28 15:32:50 +05:30
Abhinandan Prateek b64aee0a5e Merge branch 'quota' of https://github.com/shapeblue/cloudstack into quota 2015-07-28 15:11:07 +05:30
Abhinandan Prateek 2a64e947e2 quota: account for 0 tariff 2015-07-28 15:10:21 +05:30
Rohit Yadav 6d92dadb57 quota: remove unused import 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 15:01:59 +05:30
Rohit Yadav c11f84d88a ui: show actual backend error, if it's not auth failure 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 14:59:37 +05:30
Rohit Yadav fdfcd953d5 quota: fix stuff 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 14:59:37 +05:30
Abhinandan Prateek 8df0a53bf8 quota: statement genertaion date should not be in future 2015-07-28 13:53:55 +05:30
Rohit Yadav b08736af48 quota: add logic to send email using a deferred approach 
a deferred bg thread could be later used to send emails

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-27 13:25:50 +05:30
Rohit Yadav d9c38249c7 quota: fix balance api to send result when no debits have been made 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-27 13:25:15 +05:30
Rohit Yadav 38146d87eb quota: fix template update API to increase body/subject size/length 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-27 13:24:46 +05:30
Rohit Yadav 247e539b6e ui: fix UI, API usage and display rendering; fix template saving to use POST 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-27 13:24:22 +05:30
Rohit Yadav 7617182294 quota: fix ui - statement, tariff and templates 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-24 14:35:09 +05:30
Rohit Yadav 0e0df49d3e quota: remove include column from tariff, fix list tariff api to accept start date 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-24 14:34:39 +05:30
Rohit Yadav 355b2e6330 quota: implement quota email alert methods/classes and template engine to substitute variable options 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-24 12:40:33 +05:30
Rohit Yadav 9afd5791be quota: fix getusagerecords name to reflect its for getting unprocessed quota cloud_usage data 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-24 12:39:40 +05:30
Rohit Yadav 6fedff6053 quota: fix UI's escaping quotes 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-23 18:51:36 +05:30
Rohit Yadav 6b11c83fca quota: add email template UI 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-23 18:45:19 +05:30
Rohit Yadav 1725266457 quota: escape javascript, but not html 
people might want to send html emails

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-23 15:33:34 +05:30
Rohit Yadav f5be8aaf8f quota: email template backend and apis 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-23 15:23:35 +05:30
Abhinandan Prateek 15b9a894eb quota: restructuring 2015-07-23 14:38:42 +05:30
Abhinandan Prateek e5ce5e9614 quota: renaming DBUtils to ResponseBuilder as that is what it is 2015-07-23 09:17:26 +05:30
Abhinandan Prateek 72e16be98c quota: transaction commit when a account is processed 2015-07-23 09:03:36 +05:30
Abhinandan Prateek e14fbc5788 quota: adding final where ever required 2015-07-22 16:34:37 +05:30
Rohit Yadav a539574ef0 quota: fix stuff 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-22 16:04:38 +05:30
Rohit Yadav df2687aca8 quota: fix db quota usage 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-22 15:12:05 +05:30
Rohit Yadav c991b08be6 quota: fix tariff update cmd to accept start date, update effective/start date in db 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-22 15:12:05 +05:30
Rohit Yadav ae26d67cb0 quota: fix schema, set all quota tariff values to 0; effective date as cloud.com product launch date 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-22 15:12:04 +05:30
Rohit Yadav e2ab24a7bc ui: add effective from date in tariff list/table, add error handling dialogs 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-22 15:12:04 +05:30
Abhinandan Prateek 6c944dc409 quota: fix tariff type 2015-07-22 14:45:18 +05:30
Abhinandan Prateek cf003cb744 quotq: optimizing tariff retrival while calculating quota usage. 2015-07-22 12:45:58 +05:30
Abhinandan Prateek 22dccd1be6 quota: make tariff plans updatable and schedulable 2015-07-22 12:28:13 +05:30
Abhinandan Prateek f51eb1b396 quota: adding config initialization to quota manager and taking care of boundary conditions 2015-07-21 17:33:00 +05:30
Rohit Yadav 5c7befbd95 quota: assume start/end date in the balance API will be returned 
enhances UI, to reflect balance api changes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-21 15:37:52 +05:30
Rohit Yadav 3008502440 quota: add apache commons 3.4 lang3 library for using StrSubstitutor for email templates 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-21 15:24:30 +05:30
Rohit Yadav e38cd4566a quota: re-order date vs domain/account checking 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-21 15:24:30 +05:30
Abhinandan Prateek 945103b1f7 quota: for quota calc from start date to end date, adjust the credits/debits done during this period 2015-07-21 15:23:27 +05:30
Rohit Yadav ab68f38fd1 quota: remove invalid ui code, add additional checks 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-21 14:24:02 +05:30