Merge pull request #142 from hennevogel/refactor_orders

Remove the promo dvd order functionality
openSUSE · Apr 26, 2017 · 77747de · 77747de
2 parents 98bac75 + 05b7291
commit 77747de
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 391 deletions.
diff --git a/README.promodvd b/README.promodvd
diff --git a/app/controllers/order_controller.rb b/app/controllers/order_controller.rb
diff --git a/app/models/order.rb b/app/models/order.rb
diff --git a/app/models/promomailer.rb b/app/models/promomailer.rb
diff --git a/app/views/order/_form.html.erb b/app/views/order/_form.html.erb
diff --git a/app/views/order/list.html.erb b/app/views/order/list.html.erb
diff --git a/app/views/order/new.html.erb b/app/views/order/new.html.erb
diff --git a/app/views/order/pause.html.erb b/app/views/order/pause.html.erb
diff --git a/app/views/order/thanks.html.erb b/app/views/order/thanks.html.erb
diff --git a/app/views/promomailer/promo_order.text.erb b/app/views/promomailer/promo_order.text.erb
diff --git a/config/routes.rb b/config/routes.rb
@@ -57,19 +57,6 @@
     get 'appstore/:category' => :category, :constraints => { :category => /[\w\-\.: ]+/ }
   end
 
-  resource :orders, :controller => "order" do
-    member do
-     get 'thanks'
-    end
-  end
-
-  controller 'order' do
-    get 'order/thanks' => :thanks
-  end
-
-  get 'promodvd' => "order#new"
-  get 'promodvds' => "order#new"
-
   # compatibility routes for old download implementation
   get 'download' => "download#package"
   get 'download.:format' => "download#package"

diff --git a/db/migrate/20170425185949_drop_orders.rb b/db/migrate/20170425185949_drop_orders.rb
@@ -0,0 +1,25 @@
+class DropOrders < ActiveRecord::Migration
+  def change
+    drop_table "orders", force: true do |t|
+      t.string   "title",        null: false
+      t.string   "name",         null: false
+      t.string   "company"
+      t.string   "street1",      null: false
+      t.string   "street2"
+      t.string   "zip",          null: false
+      t.string   "city",         null: false
+      t.string   "county"
+      t.string   "country",      null: false
+      t.string   "phone",        null: false
+      t.string   "email",        null: false
+      t.integer  "amount",       null: false
+      t.text     "reason",       null: false
+      t.string   "deadline",     null: false
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.datetime "processed_at"
+      t.string   "processed_by"
+      t.string   "material"
+    end
+  end
+end