From 4f60b925dd96bb8d69c5a8a0c9155bad6e36ddcf Mon Sep 17 00:00:00 2001 From: Peter Defebvre Date: Mon, 20 Jan 2014 19:21:22 -0500 Subject: [PATCH] KAZOO-1770:Correct if transaction = 0 --- .../crossbar/src/modules_v2/cb_devices_v2.erl | 12 ++++++++---- applications/crossbar/src/modules_v2/cb_users_v2.erl | 12 +++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/applications/crossbar/src/modules_v2/cb_devices_v2.erl b/applications/crossbar/src/modules_v2/cb_devices_v2.erl index ba505eb2c8e..c1869e833e8 100644 --- a/applications/crossbar/src/modules_v2/cb_devices_v2.erl +++ b/applications/crossbar/src/modules_v2/cb_devices_v2.erl @@ -213,11 +213,15 @@ dry_run(#cb_context{account_id=AccountId, req_data=JObj}) -> UpdateServices = wh_service_devices:reconcile(Services, DeviceType), Charges = wh_services:activation_charges(<<"devices">>, DeviceType, Services), - Transaction = wh_transaction:debit(AccountId, wht_util:dollars_to_units(Charges)), - Desc = <<"activation charges for ", DeviceType/binary , " ", DeviceName/binary>>, - Transaction2 = wh_transaction:set_description(Desc, Transaction), - wh_services:calulate_charges(UpdateServices, [Transaction2]). + case Charges > 0 of + 'false' -> wh_services:calulate_charges(UpdateServices, []); + 'true' -> + Transaction = wh_transaction:debit(AccountId, wht_util:dollars_to_units(Charges)), + Desc = <<"activation charges for ", DeviceType/binary , " ", DeviceName/binary>>, + Transaction2 = wh_transaction:set_description(Desc, Transaction), + wh_services:calulate_charges(UpdateServices, [Transaction2]) + end. diff --git a/applications/crossbar/src/modules_v2/cb_users_v2.erl b/applications/crossbar/src/modules_v2/cb_users_v2.erl index a983578a3b9..dc51c44d567 100644 --- a/applications/crossbar/src/modules_v2/cb_users_v2.erl +++ b/applications/crossbar/src/modules_v2/cb_users_v2.erl @@ -175,9 +175,15 @@ dry_run(#cb_context{account_id=AccountId, req_data=JObj}) -> UpdateServices = wh_service_users:reconcile(Services, UserType), Charges = wh_services:activation_charges(<<"devices">>, UserType, Services), - Transaction = wh_transaction:debit(AccountId, wht_util:dollars_to_units(Charges)), - Desc = <<"activation charges for ", UserType/binary , " ", UserName/binary>>, - Transaction2 = wh_transaction:set_description(Desc, Transaction), + + case Charges > 0 of + 'false' -> wh_services:calulate_charges(UpdateServices, []); + 'true' -> + Transaction = wh_transaction:debit(AccountId, wht_util:dollars_to_units(Charges)), + Desc = <<"activation charges for ", UserType/binary , " ", UserName/binary>>, + Transaction2 = wh_transaction:set_description(Desc, Transaction), + wh_services:calulate_charges(UpdateServices, [Transaction2]) + end. wh_services:calulate_charges(UpdateServices, [Transaction2]).