migrations

app/views/campaigns/_form.html.erb

@@ -27,15 +27,11 @@
           <%= frm.input :advertisername, label: 'Advertiser Name' %>
           <%= frm.input :billingcode, label: 'Billing Code' %>
           <%= frm.input :emailaddress, label: 'Email Address' %>
-          <%= frm.input :salesrep, label: 'Sales Rep' %>
-          <%= frm.input :salesrepemail, label: 'Sales Rep Email' %>
           <%= frm.input :businessphone, label: 'Business Phone' %>
           <%= frm.input :contactphone, label: 'Contact Phone' %>
-
           <%= frm.input :customerfirstname, label: 'Customer First Name' %>
           <%= frm.input :customerlastname, label: 'Customer Last Name' %>
-          <%= frm.input :address1, label: 'Address Line 1' %>
+          <%= frm.input :address, label: 'Address' %>
-          <%= frm.input :address2, label: 'Address Line 2' %>
           <%= frm.input :city, label: 'City' %>
           <%= frm.input :state, label: 'State' %>
           <%= frm.input :zip, label: 'ZIP' %>
@@ -47,7 +43,6 @@
               <div class="<%= cycle('odd','even') %>">
                 <%= vidlist.input :videocode, label: 'Video Code' %>
                 <%= vidlist.input :producttypeid, label: 'Product Type ID' %>
-                <%= vidlist.input :remoteassetsarchive, label: 'Remote Assets Archive' %>
                 <%= vidlist.input :voiceoverselection, label: 'Voiceover Selection' %>
                 <%= vidlist.input :musicselection, label: 'Music Selection' %>
                 <%= vidlist.input :clientprovidedscript, label: 'Client Provided Script' %>

app/views/campaigns/index.html.erb

@@ -4,6 +4,7 @@
     <tr>
       <th>Client ID</th>
       <th>Listing Code</th>
+      <th>Billing Code</th>
       <th>Address</th>
       <th>City</th>
       <th>State</th>
@@ -19,6 +20,7 @@
       <tr>
         <td><%= link_to campaign.clientid, campaign_path(campaign.clientid) %></td>
         <td><%= campaign.listingcode %></td>
+        <td><%= campaign.billingcode %></td>
         <td><%= campaign.address %></td>
         <td><%= campaign.city %></td>
         <td><%= campaign.state %></td>

db/migrate/20140421171837_remove_salesrep_and_salesrepemail_from_campaign.rb

@@ -0,0 +1,6 @@
+class RemoveSalesrepAndSalesrepemailFromCampaign < ActiveRecord::Migration
+  def change
+    remove_column :campaigns, :salesrep
+    remove_column :campaigns, :salesrepemail
+  end
+end

db/migrate/20140421171931_remove_remoteassetsarchive_from_videolisting.rb

@@ -0,0 +1,5 @@
+class RemoveRemoteassetsarchiveFromVideolisting < ActiveRecord::Migration
+  def change
+    remove_column :videolistings, :remoteassetsarchive
+  end
+end

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: 20140421154050) do
+ActiveRecord::Schema.define(version: 20140421171931) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -46,8 +46,6 @@ ActiveRecord::Schema.define(version: 20140421154050) do
     t.string   "emailaddress"
     t.string   "customerfirstname"
     t.string   "customerlastname"
-    t.string   "salesrep"
-    t.string   "salesrepemail"
     t.string   "businessphone"
     t.string   "contactphone"
     t.string   "websiteurl"
@@ -105,7 +103,6 @@ ActiveRecord::Schema.define(version: 20140421154050) do
   create_table "videolistings", force: true do |t|
     t.string   "videocode"
     t.integer  "producttypeid"
-    t.string   "remoteassetsarchive"
     t.integer  "voiceoverselection"
     t.integer  "musicselection"
     t.string   "clientprovidedscript"