Set a trunk_access_code during setup. #126

7 files changed, 17 insertions, 2 deletions

diff --git a/app/controllers/gemeinschaft_setups_controller.rb b/app/controllers/gemeinschaft_setups_controller.rb
index cff652d..a62df99 100644
--- a/app/controllers/gemeinschaft_setups_controller.rb
+++ b/app/controllers/gemeinschaft_setups_controller.rb
@@ -23,6 +23,7 @@ class GemeinschaftSetupsController < ApplicationController
 
     @gemeinschaft_setup.default_company_name = generate_a_new_name(Tenant.new)
     @gemeinschaft_setup.default_system_email = 'admin@localhost'
+    @gemeinschaft_setup.trunk_access_code = '0'
   end
 
   def create
@@ -52,7 +53,7 @@ class GemeinschaftSetupsController < ApplicationController
       CallRoute.factory_defaults_prerouting(@gemeinschaft_setup.country.country_code, 
                                             @gemeinschaft_setup.country.trunk_prefix, 
                                             @gemeinschaft_setup.country.international_call_prefix, 
-                                            '', 
+                                            @gemeinschaft_setup.trunk_access_code, 
                                             @gemeinschaft_setup.default_area_code
                                             )
 
diff --git a/app/views/gemeinschaft_setups/new.de.html.haml b/app/views/gemeinschaft_setups/new.de.html.haml
index cf1f207..f977291 100644
--- a/app/views/gemeinschaft_setups/new.de.html.haml
+++ b/app/views/gemeinschaft_setups/new.de.html.haml
@@ -14,6 +14,7 @@
   = f.association :country, :label => t('gemeinschaft_setups.form.country_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.country_id.hint'), :include_blank => false
   = f.association :language, :label => t('gemeinschaft_setups.form.language_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.language_id.hint'), :include_blank => false
   = f.input :default_area_code, :label => t('gemeinschaft_setups.form.default_area_code.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_area_code.hint')
+  = f.input :trunk_access_code, :label => t('gemeinschaft_setups.form.trunk_access_code.label'), :hint => conditional_hint('gemeinschaft_setups.form.trunk_access_code.hint')
 
   = f.input :default_company_name, :label => t('gemeinschaft_setups.form.default_company_name.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_company_name.hint')
 
diff --git a/app/views/gemeinschaft_setups/new.html.haml b/app/views/gemeinschaft_setups/new.html.haml
index 5e2434e..44d9c5b 100644
--- a/app/views/gemeinschaft_setups/new.html.haml
+++ b/app/views/gemeinschaft_setups/new.html.haml
@@ -14,6 +14,7 @@
   = f.association :country, :label => t('gemeinschaft_setups.form.country_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.country_id.hint'), :include_blank => false
   = f.association :language, :label => t('gemeinschaft_setups.form.language_id.label'), :hint => conditional_hint('gemeinschaft_setups.form.language_id.hint'), :include_blank => false
   = f.input :default_area_code, :label => t('gemeinschaft_setups.form.default_area_code.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_area_code.hint')
+  = f.input :trunk_access_code, :label => t('gemeinschaft_setups.form.trunk_access_code.label'), :hint => conditional_hint('gemeinschaft_setups.form.trunk_access_code.hint')
 
   = f.input :default_company_name, :label => t('gemeinschaft_setups.form.default_company_name.label'), :hint => conditional_hint('gemeinschaft_setups.form.default_company_name.hint')
 
diff --git a/config/locales/views/gemeinschaft_setups/de.yml b/config/locales/views/gemeinschaft_setups/de.yml
index 57bc7e6..eb0145c 100644
--- a/config/locales/views/gemeinschaft_setups/de.yml
+++ b/config/locales/views/gemeinschaft_setups/de.yml
@@ -28,6 +28,9 @@ de:
       default_area_code:
         label: 'Standard Ortsvorwahl'
         hint: '030 für Berlin, 0261 für Koblenz, 02631 für Neuwied, usw.'
+      trunk_access_code:
+        label: 'Amtsholungsziffer'
+        hint: ''
       default_company_name:
         label: 'Name der Organisation'
         hint: 'z.B. Firmenname'
diff --git a/config/locales/views/gemeinschaft_setups/en.yml b/config/locales/views/gemeinschaft_setups/en.yml
index 9d5f965..3a1ac39 100644
--- a/config/locales/views/gemeinschaft_setups/en.yml
+++ b/config/locales/views/gemeinschaft_setups/en.yml
@@ -28,6 +28,9 @@ en:
       default_area_code:
         label: 'Default area code'
         hint: ''
+      trunk_access_code:
+        label: 'Trunk access code'
+        hint: ''
       default_company_name:
         label: 'Name of the organisation'
         hint: 'e.g. name of the company'
diff --git a/db/migrate/20130202140927_add_trunk_access_code_to_gemeinschaft_setup.rb b/db/migrate/20130202140927_add_trunk_access_code_to_gemeinschaft_setup.rb
new file mode 100644
index 0000000..82fa3ad
--- /dev/null
+++ b/db/migrate/20130202140927_add_trunk_access_code_to_gemeinschaft_setup.rb
@@ -0,0 +1,5 @@
+class AddTrunkAccessCodeToGemeinschaftSetup < ActiveRecord::Migration
+  def change
+    add_column :gemeinschaft_setups, :trunk_access_code, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 31d4063..5d4b5e3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130130185300) do
+ActiveRecord::Schema.define(:version => 20130202140927) do
 
   create_table "access_authorizations", :force => true do |t|
     t.string   "access_authorizationable_type"
@@ -540,6 +540,7 @@ ActiveRecord::Schema.define(:version => 20130130185300) do
     t.string   "default_area_code"
     t.string   "default_company_name"
     t.string   "default_system_email"
+    t.string   "trunk_access_code"
   end
 
   create_table "gs_cluster_sync_log_entries", :force => true do |t|