Merge pull request #55 from voxter/3.20-production-changes

Added missed changes from vancouver to release
voxter · Jun 7, 2015 · 6897132 · 6897132
2 parents da5c7a2 + 0a5dd9e
commit 6897132
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 5 deletions.
diff --git a/applications/callflow/src/module/cf_kvs_set.erl b/applications/callflow/src/module/cf_kvs_set.erl
@@ -112,7 +112,7 @@ format_json_rec([Prim|Others], _) ->
     format_type(Prim) ++ "," ++ format_json_rec(Others, [Prim]);
 
 format_json_rec(V, _) ->
-    "\"" ++ binary_to_list(V) ++ "\"".
+    "\"" ++ wh_util:to_list(V) ++ "\"".
 
 format_type(Data) when not is_binary(Data) ->
     wh_util:to_list(Data);

diff --git a/applications/callflow/src/module/cf_voicemail.erl b/applications/callflow/src/module/cf_voicemail.erl
@@ -99,6 +99,7 @@
           %% Post playbak
           ,keep = <<"1">>
           ,replay = <<"2">>
+          ,envelope = <<"5">>
           ,delete = <<"7">>
          }).
 -type vm_keys() :: #keys{}.
@@ -714,6 +715,8 @@ play_messages([H|T]=Messages, Count, #mailbox{timezone=Timezone}=Box, Call) ->
               ,{'play', Message}
               ,{'prompt', <<"vm-received">>}
               ,{'say',  get_unix_epoch(wh_json:get_value(<<"timestamp">>, H), Timezone), <<"current_date_time">>}
+              ,{'tts', <<"from">>}
+              ,{'say', wh_json:get_value(<<"caller_id_number">>, H)}
               ,{'prompt', <<"vm-message_menu">>}
              ],
     case message_menu(Prompt, Box, Call) of
@@ -722,6 +725,18 @@ play_messages([H|T]=Messages, Count, #mailbox{timezone=Timezone}=Box, Call) ->
             _ = whapps_call_command:b_prompt(<<"vm-saved">>, Call),
             set_folder(?FOLDER_SAVED, H, Box, Call),
             play_messages(T, Count, Box, Call);
+        {'ok', 'envelope'} ->
+            lager:info("caller chose to hear envelope"),
+            Prompt2 = [{'prompt', <<"vm-message_number">>}
+                       ,{'say', wh_util:to_binary(Count - length(Messages) + 1), <<"number">>}
+                       ,{'prompt', <<"vm-received">>}
+                       ,{'say', get_unix_epoch(wh_json:get_value(<<"timestamp">>, H), Timezone), <<"current_date_time">>}
+                       ,{'tts', <<"from">>}
+                       ,{'say', wh_json:get_value(<<"caller_id_number">>, H)}
+                       ,{'prompt', <<"vm-message_menu">>}
+                      ],
+            whapps_call_command:audio_macro(Prompt2, Call),
+            play_messages(Messages, Count, Box, Call);
         {'ok', 'delete'} ->
             lager:info("caller choose to delete the message"),
             _ = whapps_call_command:b_prompt(<<"vm-deleted">>, Call),
@@ -749,7 +764,7 @@ play_messages([], _, _, _) ->
 %% user provides a valid option
 %% @end
 %%--------------------------------------------------------------------
--type message_menu_returns() :: {'ok', 'keep' | 'delete' | 'return' | 'replay'}.
+-type message_menu_returns() :: {'ok', 'keep' | 'delete' | 'envelope' | 'return' | 'replay'}.
 
 -spec message_menu(mailbox(), whapps_call:call()) ->
                           {'error', 'channel_hungup' | 'channel_unbridge' | wh_json:object()} |
@@ -762,6 +777,7 @@ message_menu(Box, Call) ->
 message_menu(Prompt, #mailbox{keys=#keys{replay=Replay
                                          ,keep=Keep
                                          ,delete=Delete
+                                         ,envelope=Envelope
                                          ,return_main=ReturnMain
                                         }
                               ,interdigit_timeout=Interdigit
@@ -777,6 +793,7 @@ message_menu(Prompt, #mailbox{keys=#keys{replay=Replay
                                            )
     of
         {'ok', Keep} -> {'ok', 'keep'};
+        {'ok', Envelope} -> {'ok', 'envelope'};
         {'ok', Delete} -> {'ok', 'delete'};
         {'ok', ReturnMain} -> {'ok', 'return'};
         {'ok', Replay} -> {'ok', 'replay'};
@@ -1497,6 +1514,7 @@ populate_keys(Call) ->
           ,set_pin = wh_json:get_binary_value([<<"voicemail">>, <<"set_pin">>], JObj, Default#keys.set_pin)
           ,return_main = wh_json:get_binary_value([<<"voicemail">>, <<"return_main_menu">>], JObj, Default#keys.return_main)
           ,keep = wh_json:get_binary_value([<<"voicemail">>, <<"keep">>], JObj, Default#keys.keep)
+          ,envelope = wh_json:get_binary_value([<<"voicemail">>, <<"envelope">>], JObj, Default#keys.envelope)
           ,replay = wh_json:get_binary_value([<<"voicemail">>, <<"replay">>], JObj, Default#keys.replay)
           ,delete = wh_json:get_binary_value([<<"voicemail">>, <<"delete">>], JObj, Default#keys.delete)
          }.

diff --git a/applications/crossbar/src/modules/cb_faxboxes.erl b/applications/crossbar/src/modules/cb_faxboxes.erl
@@ -29,7 +29,7 @@
 -define(GPC_URL_REGISTER, <<?GPC_URL,"register">>).
 -define(GPC_PROXY, <<"kazoo-cloud-fax-printer-proxy">>).
 -define(GPC_PROXY_HEADER,{"X-CloudPrint-Proxy","kazoo-cloud-fax-printer-proxy"}).
--define(DEFAULT_FAX_SMTP_DOMAIN, <<"fax.kazoo.io">>).
+-define(DEFAULT_FAX_SMTP_DOMAIN, <<"fax.voxter.com">>).
 
 -define(CLOUD_STATE_FIELD, <<"pvt_cloud_state">>).
 -define(CLOUD_CLAIM_URL_FIELD, <<"pvt_cloud_connector_claim_url">>).

diff --git a/applications/ecallmgr/src/ecallmgr.erl b/applications/ecallmgr/src/ecallmgr.erl
@@ -85,6 +85,6 @@ declare_exchanges() ->
     _ = wapi_resource:declare_exchanges(),
     _ = wapi_route:declare_exchanges(),
     _ = wapi_sysconf:declare_exchanges(),
-    _ = wapi_sms:declare_exchanges(),
+    % _ = wapi_sms:declare_exchanges(),
     _ = wapi_presence:declare_exchanges(),
     wapi_self:declare_exchanges().
diff --git a/applications/stepswitch/src/stepswitch.erl b/applications/stepswitch/src/stepswitch.erl
@@ -79,5 +79,5 @@ declare_exchanges() ->
     _ = wapi_offnet_resource:declare_exchanges(),
     _ = wapi_resource:declare_exchanges(),
     _ = wapi_route:declare_exchanges(),
-    _ = wapi_sms:declare_exchanges(),
+    % _ = wapi_sms:declare_exchanges(),
     wapi_self:declare_exchanges().
diff --git a/core/whistle_apps-1.0.0/priv/couchdb/views/accounts.json b/core/whistle_apps-1.0.0/priv/couchdb/views/accounts.json
@@ -29,6 +29,9 @@
         "list_by_whitelabel_domain": {
             "map": "function(doc) { if (doc.pvt_type != 'account' || doc.pvt_deleted || !doc.pvt_whitelabel_domain) return; var domain = doc.pvt_whitelabel_domain.toLowerCase(); emit(domain, {'account_id': doc.pvt_account_id, 'account_db': doc.pvt_account_db}); }"
         },
+        "list_by_whitelabel_realm": {
+            "map": "function(doc) { if (doc.pvt_type != 'account' || doc.pvt_deleted || !doc.pvt_whitelabel_domain) return; var domain = doc.pvt_whitelabel_domain.toLowerCase(); emit(doc.realm, {'domain': domain}); }"
+        },
         "listing_by_sso":{
             "map":"function(doc) { if (doc.pvt_type != 'account' || doc.pvt_deleted || !doc.sso ) return; for(id in doc.sso.ids) {emit([doc.sso.provider, doc.sso.ids[id]], {'account_id': doc._id, 'account_db': doc.pvt_account_db});} }"
         },

diff --git a/core/whistle_number_manager-1.0.0/src/carriers/wnm_wikibuli.erl b/core/whistle_number_manager-1.0.0/src/carriers/wnm_wikibuli.erl
@@ -0,0 +1,68 @@
+%%%-------------------------------------------------------------------
+%%% @copyright (C) 2011-2014, 2600Hz INC
+%%% @doc
+%%%
+%%% Handle client requests for phone_number documents
+%%%
+%%% @end
+%%% @contributors
+%%%   Karl Anderson
+%%%-------------------------------------------------------------------
+-module(wnm_wikibuli).
+
+-export([find_numbers/3]).
+-export([acquire_number/1]).
+-export([disconnect_number/1]).
+-export([is_number_billable/1]).
+-export([should_lookup_cnam/0]).
+
+-include("../wnm.hrl").
+
+%%--------------------------------------------------------------------
+%% @public
+%% @doc
+%% Query the local system for a quanity of available numbers
+%% in a rate center
+%% @end
+%%--------------------------------------------------------------------
+-spec find_numbers(ne_binary(), pos_integer(), wh_proplist()) ->
+                          {'error', 'non_available'}.
+find_numbers(Number, Quanity, Opts) when size(Number) < 5 ->
+    find_numbers(<<"+1", Number/binary>>, Quanity, Opts);
+find_numbers(_Number, _Quanity, _Opts) ->
+    %% TODO: given the requestors account number discovery wnm_wikibuli numbers that are
+    %%       available but managed by accendants of the account.
+    {'error', 'non_available'}.
+
+
+-spec is_number_billable(wnm_number()) -> 'false'.
+is_number_billable(_Number) -> 'false'.
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% Acquire a given number from the carrier
+%% @end
+%%--------------------------------------------------------------------
+-spec acquire_number/1 :: (wnm_number()) -> wnm_number().
+acquire_number(#number{dry_run='true'}=Number) -> Number;
+acquire_number(Number) -> Number.
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% Release a number from the routing table
+%% @end
+%%--------------------------------------------------------------------
+
+-spec disconnect_number(wnm_number()) -> wnm_number().
+disconnect_number(Number) ->
+        Number#number{state = <<"released">>, hard_delete='true'}.
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% @end
+%%--------------------------------------------------------------------
+-spec should_lookup_cnam() -> 'true'.
+should_lookup_cnam() -> 'true'.