Changeset 1244

Timestamp:

11/12/06 17:25:03 (2 years ago)

Author:

james

Message:

propedit

Files:

• peasantonline/app/controllers/catalog_controller.rb (modified) (2 diffs)
• peasantonline/app/models/order.rb (modified) (1 diff)
• peasantonline/app/views/admin/_order.rhtml (modified) (1 diff)
• peasantonline/public/images/products (modified) (1 prop)

peasantonline/app/controllers/catalog_controller.rb

@@ -165 +165 @@
-              rescue
-                # FIXME: this should go back to checkout, not to homepage:
+                remove_bad_order()
-                redirect_to_index("Card was rejected: #{@transaction.error_message}")
-              end
@@ -176 +177 @@
-        
-        private 
+        
+        def remove_bad_order()
+    # Remove bad order
+    for line_item in @order.line_items
+      LineItem.find(line_item.id).destroy
+    end
+    
+    Order.find(@order.id).destroy
+  end
-        def find_cart 
-          session[:cart] ||= Cart.new 

peasantonline/app/models/order.rb

@@ -14 +14 @@
-        AjaxScaffold::ScaffoldColumn.new(self, { :name => "email", :label => "Email"}),
-        AjaxScaffold::ScaffoldColumn.new(self, { :name => "status", :label => "Status"}),
+        AjaxScaffold::ScaffoldColumn.new(self, { :name => "comments", :label => "Comments", :sortable => false}),
-        AjaxScaffold::ScaffoldColumn.new(self, { :name => "items", :label => "# of Items", :sortable => false}),
-        AjaxScaffold::ScaffoldColumn.new(self, { :name => "total", :label => "Order Total", :sortable =>  false})

peasantonline/app/views/admin/_order.rhtml

@@ -8 +8 @@
-        <td><%= order.email %>&nbsp;</td>
-        <td><%= order.status %>&nbsp;</td>
+        <td><%= order.comments %>&nbsp;</td>
-        <td><%= 
-        sum = 0