summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 20:30:58 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 20:30:58 +0100
commitc1dfb19a89a2f191bece906051477e12f3713512 (patch)
tree761aa11bd69e5ca1a7ef8edfd8d81478e6bafdfe /app/models
parent48ff1a850df34ecc40e71882e2c7872211c353e4 (diff)
parent022f8458e18c7091e1e1dd25bf53f78867354757 (diff)
Merge branch 'develop'
Diffstat (limited to 'app/models')
-rw-r--r--app/models/automatic_call_distributor.rb10
-rw-r--r--app/models/tenant.rb2
2 files changed, 11 insertions, 1 deletions
diff --git a/app/models/automatic_call_distributor.rb b/app/models/automatic_call_distributor.rb
index 678e0eb..cd887d5 100644
--- a/app/models/automatic_call_distributor.rb
+++ b/app/models/automatic_call_distributor.rb
@@ -15,7 +15,17 @@ class AutomaticCallDistributor < ActiveRecord::Base
JOIN_ON = ['agents_available', 'agents_active', 'always']
LEAVE_ON = ['no_agents_available_timeout', 'no_agents_active_timeout', 'no_agents_available', 'no_agents_active', 'timeout', 'never']
+ after_initialize :set_defaults
+
def to_s
self.name
end
+
+ private
+ def set_defaults
+ self.announce_call_agents ||= 'ivr/ivr-stay_on_line_call_answered_momentarily.wav'
+ self.greeting ||= 'ivr/ivr-thank_you_for_calling.wav'
+ self.goodbye ||= 'ivr/ivr-thank_you_for_calling.wav'
+ self.music ||= 'local_stream://mohl'
+ end
end
diff --git a/app/models/tenant.rb b/app/models/tenant.rb
index 66e50d3..d9351b7 100644
--- a/app/models/tenant.rb
+++ b/app/models/tenant.rb
@@ -226,7 +226,7 @@ class Tenant < ActiveRecord::Base
:description => "Hersteller von Gemeinschaft. Kommerziellen Support und Consulting für Gemeinschaft.",
:homepage_organization => 'http://amooma.de',
:twitter_account => 'amooma_de',
- :facebook_account => 'https://www.facebook.com/AMOOMA.GmbH',
+ :facebook_account => 'AMOOMA.GmbH',
)
amooma.phone_numbers.create(
:name => 'Office',