Add tax required details to camps getting an art grant [Completes #196]

Midburn · Mar 25, 2017 · aa751fd · aa751fd
1 parent d1aba6b
commit aa751fd
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/app/views/camps/_form.haml b/app/views/camps/_form.haml
@@ -505,12 +505,26 @@
 
       %br
       .combo
-        = form.label t("form_dream_scholarship_bank_account_info")
+        = form.label :dreamscholarship_bank_account_info
         .field-description
           = t("form_dream_scholarship_bank_account_info_guidetext_html")
         %blockquote
           = best_in_place_if @can_edit, @camp, :dreamscholarship_bank_account_info, html_attrs: {maxlength: 128, class: "form-control"}, as: :textarea, display_with: :simple_format, place_holder: t(:form_click_to_edit_html)
 
+      %br
+      .combo
+        = form.label :dreamscholarship_bank_account_holder_id
+        %blockquote
+          = best_in_place_if @can_edit, @camp, :dreamscholarship_bank_account_holder_id, html_attrs: {maxlength: 10, class: "form-control"}, display_with: :simple_format, place_holder: t(:form_click_to_edit_html)
+
+      %br
+      .combo
+        = form.label :dreamscholarship_bank_account_holder_address
+        .field-description
+          = t("form_dream_scholarship_bank_account_holder_address_guidetext_html")
+        %blockquote
+          = best_in_place_if @can_edit, @camp, :dreamscholarship_bank_account_holder_address, html_attrs: {maxlength: 255, class: "form-control"}, display_with: :simple_format, place_holder: t(:form_click_to_edit_html)
+
       .h3
         = t("form_dream_scholarship_financial_conduct")
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -223,10 +223,9 @@ en:
   form_dream_scholarship_budget_form_desc: Please fill in your budget details in the
     following file. This file is your personal file and was created when you created
     Dream.
-  form_dream_scholarship_bank_account_info: Bank account information to which the
-    scholarship would be wired to.
   form_dream_scholarship_bank_account_info_guidetext_html: Name of account holder/bank
     no./branch/account number
+  form_dream_scholarship_bank_account_holder_address_guidetext_html: "Street/Number/City/Postal code"
   form_dream_scholarship_financial_conduct: Financial conduct
   form_dream_scholarship_financial_conduct_is_intial_budget: Has the project bare minimum budget met?
   form_dream_scholarship_financial_conduct_intial_budget_desc: Upon approval, scholarships will be granted only after the art installation has been completed and once it's approved as "in line with scholarship's requirements" (approx. 45 days after the event). How are you planning on financing the construction of your art installation?
@@ -664,7 +663,9 @@ en:
         dreamscholarship_budget_min_original: :form_dream_scholarship_budget_min_original
         dreamscholarship_budget_max_original: :form_dream_scholarship_budget_max_original
         dreamscholarship_budget_max_original_desc: :form_dream_scholarship_budget_max_original_desc
-        dreamscholarship_bank_account_info: :form_dream_scholarship_bank_account_info
+        dreamscholarship_bank_account_info: "Bank account information to which the scholarship would be wired to."
+        dreamscholarship_bank_account_holder_id: ID number of the account holder
+        dreamscholarship_bank_account_holder_address: Home address of the account holder
         dreamscholarship_financial_conduct_is_intial_budget: :form_dream_scholarship_financial_conduct_is_intial_budget
         dreamscholarship_financial_conduct_money_raise_desc: :form_dream_scholarship_financial_conduct_money_raise_desc
         dreamscholarship_execution_potential_previous_experience: :form_dream_scholarship_execution_potential_previous_experience

diff --git a/config/locales/he.yml b/config/locales/he.yml
@@ -194,8 +194,8 @@ he:
   form_dream_scholarship_budget_max_original: "תקציב פרויקט"
   form_dream_scholarship_budget_max_original_desc: "פרטו מה התוספת מאפשרת"
   form_dream_scholarship_budget_form_desc: "אנא מלאו בקובץ הבא את התקציב שלכם. שימו לב זה קובץ אישי שלכם והוא נוצר כשיצרתם את חלום."
-  form_dream_scholarship_bank_account_info: "פרטי חשבון בנק אליו תועבר המלגה:"
   form_dream_scholarship_bank_account_info_guidetext_html: "שם בעל החשבון/מס בנק/סניף/חשבון"
+  form_dream_scholarship_bank_account_holder_address_guidetext_html: "רחוב/מספר/יישוב/מיקוד"
   form_dream_scholarship_financial_conduct: "התנהלות פיננסית"
   form_dream_scholarship_financial_conduct_is_intial_budget: "האם קיים התקציב הראשוני לקיום הפרויקט?"
   form_dream_scholarship_financial_conduct_intial_budget_desc: "אם הבקשה תתקבל, מלגה מוענקת רק לאחר ביצוע המיצב ועמידה בתנאי המלגה (כחודש וחצי לאחר מידברן). כיצד אתם מתכוונים לממן את בניית המיצב?"
@@ -631,7 +631,9 @@ he:
         dreamscholarship_budget_min_original: :form_dream_scholarship_budget_min_original
         dreamscholarship_budget_max_original: :form_dream_scholarship_budget_max_original
         dreamscholarship_budget_max_original_desc: :form_dream_scholarship_budget_max_original_desc
-        dreamscholarship_bank_account_info: :form_dream_scholarship_bank_account_info
+        dreamscholarship_bank_account_info: "פרטי חשבון בנק אליו תועבר המלגה:"
+        dreamscholarship_bank_account_holder_id: מספר תעודת זהות של בעל החשבון
+        dreamscholarship_bank_account_holder_address: כתובת מגורים של בעל החשבון
         dreamscholarship_financial_conduct_is_intial_budget: :form_dream_scholarship_financial_conduct_is_intial_budget
         dreamscholarship_financial_conduct_intial_budget_desc: "כיצד תממנו את בניית המיצב"
         dreamscholarship_financial_conduct_money_raise_desc: :form_dream_scholarship_financial_conduct_money_raise_desc

diff --git a/db/migrate/20170325072418_add_bank_details_to_camp.rb b/db/migrate/20170325072418_add_bank_details_to_camp.rb
@@ -0,0 +1,6 @@
+class AddBankDetailsToCamp < ActiveRecord::Migration
+  def change
+    add_column :camps, :dreamscholarship_bank_account_holder_id, :string, limit: 10
+    add_column :camps, :dreamscholarship_bank_account_holder_address, :string, limit: 255
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170306232700) do
+ActiveRecord::Schema.define(version: 20170325072418) do
 
   create_table "active_admin_comments", force: :cascade do |t|
     t.string   "namespace",     :index=>{:name=>"index_active_admin_comments_on_namespace"}
@@ -160,6 +160,8 @@
     t.string   "safety_file_comments",                                     :limit=>4096
     t.string   "safety_materials",                                         :limit=>4096
     t.string   "safety_tools",                                             :limit=>4096
+    t.string   "dreamscholarship_bank_account_holder_id",                  :limit=>10
+    t.string   "dreamscholarship_bank_account_holder_address",             :limit=>255
   end
 
   create_table "grants", force: :cascade do |t|