From c7804aebf1a0b5d2655c79f99de4e14d4121ddf6 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 15 Oct 2017 17:26:00 -0500 Subject: [PATCH] allow posa-cards to indicate if are test cards. not used; just tracked atm --- admin/app/admin/posa_card_upload.rb | 10 ++++++---- db/manifest | 2 +- db/up/amazon_signup.sql | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/admin/app/admin/posa_card_upload.rb b/admin/app/admin/posa_card_upload.rb index 784a325c3..73fed6cf0 100644 --- a/admin/app/admin/posa_card_upload.rb +++ b/admin/app/admin/posa_card_upload.rb @@ -10,14 +10,15 @@ ActiveAdmin.register_page "POSA Card Uploads" do file = params[:jam_ruby_posa_card][:csv] array_of_arrays = CSV.read(file.tempfile.path) array_of_arrays.each do |row| - if row.length != 4 - raise "UKNONWN CSV FORMAT! Must be 4 columns" + if row.length != 5 + raise "UKNONWN CSV FORMAT! Must be 5 columns" end code = row[0] lesson_package_type = row[1] - preactivate = row[2].strip == "true" - requires_purchase = row[3].strip == "true" + preactivate = row[2].strip.downcase == "true" + requires_purchase = row[3].downcase== "true" + is_test = row[4].strip.downcase == "true" posa_card = PosaCard.new posa_card.code = code @@ -26,6 +27,7 @@ ActiveAdmin.register_page "POSA Card Uploads" do posa_card.requires_purchase = requires_purchase posa_card.purchased = !requires_purchase posa_card.card_type = params[:jam_ruby_posa_card][:card_type] + posa_card.is_test = is_test if posa_card.card_type == PosaCard::JAM_CLASS_4 diff --git a/db/manifest b/db/manifest index 3eefec9fa..21feab3b6 100755 --- a/db/manifest +++ b/db/manifest @@ -378,4 +378,4 @@ mobile_recording_support.sql youtube_broadcast.sql amazon_v1.sql sms_index_optimize.sql -amazon_signup.sql \ No newline at end of file +amazon_signup.sql diff --git a/db/up/amazon_signup.sql b/db/up/amazon_signup.sql index 4f973ad4f..dd4196e48 100644 --- a/db/up/amazon_signup.sql +++ b/db/up/amazon_signup.sql @@ -1,2 +1,3 @@ ALTER TABLE users ADD COLUMN under_13 BOOLEAN; -ALTER TABLE users ADD COLUMN via_amazon BOOLEAN; \ No newline at end of file +ALTER TABLE users ADD COLUMN via_amazon BOOLEAN; +ALTER TABLE posa_cards ADD COLUMN is_test BOOLEAN DEFAULT FALSE; \ No newline at end of file