Skip to content
Browse files

updating files

  • Loading branch information...
1 parent abb8998 commit a94c90c775f7dfda1c297e80f8ac7976c8160ffd @SiobhanSchnittger SiobhanSchnittger committed Jan 4, 2012
View
3 .idea/Street_Heart_Project.iml
@@ -19,7 +19,6 @@
<orderEntry type="library" scope="PROVIDED" name="treetop (v1.4.10, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.3.4, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="actionmailer (v3.0.10, ruby-1.9.2-p290) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.3.4, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="builder (v2.1.2, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="actionpack (v3.0.10, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="carrierwave (v0.5.8, ruby-1.9.2-p290) [gem]" level="application" />
@@ -41,8 +40,8 @@
<orderEntry type="library" scope="PROVIDED" name="mail (v2.2.19, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activerecord (v3.0.10, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.0.21, ruby-1.9.2-p290) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="rails (v3.0.10, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="tzinfo (v0.3.31, ruby-1.9.2-p290) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rails (v3.0.10, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="abstract (v1.0.0, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.5.0, ruby-1.9.2-p290) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="arel (v2.0.10, ruby-1.9.2-p290) [gem]" level="application" />
View
533 .idea/workspace.xml
@@ -1,30 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
-
- <list default="true" id="af10e930-f888-4e32-bb21-d436651a41d5" name="Default" comment="">
+ <list default="true" id="eeb7c784-2e43-4483-a18a-70f3ae960c88" name="Default" comment="">
+ <change type="DELETED" beforePath="C:\Users\Siobhan\Documents\CWEBTECH\Server_Side\Project_Street_Heart\Test\Street_Heart_Project\db\migrate\20111230152903_acts_as_taggable_on.rb" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/Street_Heart_Project.iml" afterPath="$PROJECT_DIR$/.idea/Street_Heart_Project.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/development.sqlite3" afterPath="$PROJECT_DIR$/db/development.sqlite3" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
- <list default="true" id="dd9128c2-6f24-4e38-8b82-87fa4a2a78ff" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/Street_Heart_Project.iml" afterPath="$PROJECT_DIR$/.idea/Street_Heart_Project.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/development.sqlite3" afterPath="$PROJECT_DIR$/db/development.sqlite3" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/admin_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/admin_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/application_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/application_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/products_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/products_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/users_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/users_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/welcome_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/welcome_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/wishlist_items_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/wishlist_items_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/wishlists_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/wishlists_controller.rb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/orders/thank_you.html.erb" afterPath="$PROJECT_DIR$/app/views/orders/thank_you.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/products/index.html.erb" afterPath="$PROJECT_DIR$/app/views/products/index.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/users/show.html.erb" afterPath="$PROJECT_DIR$/app/views/users/show.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/wishlists/_wishlist.html.erb" afterPath="$PROJECT_DIR$/app/views/wishlists/_wishlist.html.erb" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/stylesheets/Street_Heart_Styles.css" afterPath="$PROJECT_DIR$/public/stylesheets/Street_Heart_Styles.css" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/stylesheets/scaffold.css" afterPath="$PROJECT_DIR$/public/stylesheets/scaffold.css" />
-
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/orders/show.html.erb" afterPath="$PROJECT_DIR$/app/views/orders/show.html.erb" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/schema.rb" afterPath="$PROJECT_DIR$/db/schema.rb" />
</list>
<ignored path="Street_Heart_Project.iws" />
<ignored path=".idea/workspace.xml" />
@@ -47,78 +30,48 @@
</component>
<component name="FileEditorManager">
<leaf>
-
- <file leaf-file-name="Gemfile" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/Gemfile">
+ <file leaf-file-name="line_item.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/models/line_item.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="12" selection-start="828" selection-end="828" vertical-scroll-proportion="0.9384858">
-
- <file leaf-file-name="Street_Heart_Styles.css" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/public/stylesheets/Street_Heart_Styles.css">
- <provider selected="true" editor-type-id="text-editor">
- <state line="917" column="19" selection-start="15839" selection-end="15839" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="admin_controller.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/controllers/admin_controller.rb">
+ <file leaf-file-name="show.html.erb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/views/orders/show.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="59" selection-start="105" selection-end="105" vertical-scroll-proportion="0.0">
+ <state line="20" column="3" selection-start="203" selection-end="203" vertical-scroll-proportion="-13.076923">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="application_controller.rb" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/controllers/application_controller.rb">
+ <file leaf-file-name="order.rb" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/models/order.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="54" selection-start="919" selection-end="967" vertical-scroll-proportion="1.1241935">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="user.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/models/user.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="3" selection-start="51" selection-end="165" vertical-scroll-proportion="0.0">
-
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
+ <component name="FindManager">
+ <FindUsagesManager>
+ <setting name="OPEN_NEW_TAB" value="false" />
+ </FindUsagesManager>
+ </component>
<component name="Git.Settings">
<option name="CHECKOUT_INCLUDE_TAGS" value="false" />
<option name="UPDATE_CHANGES_POLICY" value="STASH" />
</component>
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
-
- <option value="$PROJECT_DIR$/Gemfile" />
-
- <option value="$PROJECT_DIR$/app/views/carts/_cart.html.erb" />
- <option value="$PROJECT_DIR$/app/controllers/line_items_controller.rb" />
- <option value="$PROJECT_DIR$/app/views/layouts/_storeSidebar.erb" />
- <option value="$PROJECT_DIR$/public/stylesheets/scaffold.css" />
- <option value="$PROJECT_DIR$/app/views/products/index.html.erb" />
- <option value="$PROJECT_DIR$/app/controllers/products_controller.rb" />
- <option value="$PROJECT_DIR$/app/views/wishlists/_wishlist.html.erb" />
- <option value="$PROJECT_DIR$/app/views/users/show.html.erb" />
- <option value="$PROJECT_DIR$/app/views/orders/thank_you.html.erb" />
- <option value="$PROJECT_DIR$/public/stylesheets/Street_Heart_Styles.css" />
- <option value="$PROJECT_DIR$/app/controllers/admin_controller.rb" />
- <option value="$PROJECT_DIR$/app/controllers/wishlists_controller.rb" />
- <option value="$PROJECT_DIR$/app/controllers/application_controller.rb" />
- <option value="$PROJECT_DIR$/app/controllers/wishlist_items_controller.rb" />
- <option value="$PROJECT_DIR$/app/controllers/welcome_controller.rb" />
- <option value="$PROJECT_DIR$/app/controllers/users_controller.rb" />
-
+ <option value="$PROJECT_DIR$/app/views/orders/show.html.erb" />
</list>
</option>
</component>
@@ -148,13 +101,7 @@
<sortByType />
</navigator>
<panes>
-
- <pane id="Favorites" />
<pane id="RailsProjectView" />
-
- <pane id="Scope" />
- <pane id="Favorites" />
-
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -173,25 +120,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
-
- </subPane>
- </pane>
- <pane id="Scope" />
-
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="public" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Street_Heart_Project" />
@@ -202,11 +130,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="public" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="stylesheets" />
+ <option name="myItemId" value="db" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -220,15 +144,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
+ <option name="myItemId" value="db" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="wishlists" />
+ <option name="myItemId" value="migrate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -245,97 +165,17 @@
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="wishlist_items" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="models" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Street_Heart_Project" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="controllers" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="RailsProjectView" />
-
+ <pane id="Favorites" />
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
</component>
-
<component name="RunManager">
- <list size="0" />
-
- <component name="RunManager" selected="Rails.Development: Street_Heart_Project">
<configuration default="true" type="RakeRunConfigurationType" factoryName="Rake">
<module name="" />
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -354,212 +194,7 @@
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
<method />
</configuration>
- <configuration default="true" type="RailsRunConfigurationType" factoryName="Rails">
- <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
- <module name="" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs />
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="127.0.0.1" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
- <method />
- </configuration>
- <configuration default="true" type="RSpecRunConfigurationType" factoryName="RSpec">
- <predefined_log_file id="RUBY_RSPEC" enabled="true" />
- <module name="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs />
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
- <method />
- </configuration>
- <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby">
- <module name="" />
- <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="" />
- <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
- <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
- <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
- <envs />
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />
- <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
- <method />
- </configuration>
- <configuration default="true" type="JavascriptDebugSession" factoryName="Remote">
- <JSRemoteDebuggerConfigurationSettings>
- <option name="engineId" value="embedded" />
- <option name="fileUrl" />
- </JSRemoteDebuggerConfigurationSettings>
- <method />
- </configuration>
- <configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
- <predefined_log_file id="RUBY_CUCUMBER" enabled="true" />
- <module name="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs>
- <env name="ANSICON" value="" />
- </envs>
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*.feature" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TAGS_FILTER" VALUE="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_NAME_FILTER" VALUE="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_ARGS" VALUE="--color -r features" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="VERBOSE_OPTION" VALUE="false" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_RUNNER_PATH" VALUE="" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_RUNNER" VALUE="false" />
- <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SETTINGS_VERSION" VALUE="2" />
- <method />
- </configuration>
- <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
- <JSDebuggerConfigurationSettings>
- <option name="engineId" value="embedded" />
- <option name="fileUrl" />
- </JSDebuggerConfigurationSettings>
- <method />
- </configuration>
- <configuration default="true" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda">
- <predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
- <module name="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs />
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_CLASS_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="INHERITANCE_CHECK_DISABLED" VALUE="false" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
- <method />
- </configuration>
- <configuration default="false" name="test" type="RakeRunConfigurationType" factoryName="Rake">
- <module name="Street_Heart_Project" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$PROJECT_DIR$" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs>
- <env name="RAILS_ENV" value="test" />
- </envs>
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
- <method />
- </configuration>
- <configuration default="false" name="spec" type="RakeRunConfigurationType" factoryName="Rake">
- <module name="Street_Heart_Project" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$PROJECT_DIR$" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs />
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
- <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
- <method />
- </configuration>
- <configuration default="false" name="Production: Street_Heart_Project" type="RailsRunConfigurationType" factoryName="Rails">
- <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
- <module name="Street_Heart_Project" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="C:\Street_Heart_Project" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs />
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="127.0.0.1" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="production" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
- <method />
- </configuration>
- <configuration default="false" name="Development: Street_Heart_Project" type="RailsRunConfigurationType" factoryName="Rails">
- <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
- <module name="Street_Heart_Project" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="C:\Street_Heart_Project" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs />
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" track_test_folders="true" runner="rcov" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="127.0.0.1" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />
- <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
- <RunnerSettings RunnerId="RubyDebugRunner" />
- <ConfigurationWrapper RunnerId="RubyDebugRunner" />
- <method />
- </configuration>
- <list size="4">
- <item index="0" class="java.lang.String" itemvalue="Rake.test" />
- <item index="1" class="java.lang.String" itemvalue="Rake.spec" />
- <item index="2" class="java.lang.String" itemvalue="Rails.Production: Street_Heart_Project" />
- <item index="3" class="java.lang.String" itemvalue="Rails.Development: Street_Heart_Project" />
- </list>
-
+ <list size="0" />
</component>
<component name="ShelveChangesManager" show_recycled="false" />
<component name="SvnConfiguration" maxAnnotateRevisions="500">
@@ -581,26 +216,21 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <created>1325676014616</created>
- <updated>1325676014616</updated>
+ <created>1325713835782</created>
+ <updated>1325713835782</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="0" width="1382" height="744" extended-state="0" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
-
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24943139" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-
- <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34306568" sideWeight="0.0" order="0" side_tool="false" content_ui="tabs" />
-
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24943139" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
@@ -656,124 +286,27 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
-
- <entry file="file://$PROJECT_DIR$/Gemfile">
- <provider selected="true" editor-type-id="text-editor">
- <state line="35" column="12" selection-start="828" selection-end="828" vertical-scroll-proportion="0.9384858">
-
- <entry file="file://$PROJECT_DIR$/app/views/products/index.html.erb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="37" column="76" selection-start="1192" selection-end="1192" vertical-scroll-proportion="-14.384615">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/views/wishlists/_wishlist.html.erb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="4" column="0" selection-start="64" selection-end="64" vertical-scroll-proportion="0.11805555">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/models/cart.rb">
+ <entry file="file://$PROJECT_DIR$/app/models/line_item.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/products_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1" column="40" selection-start="89" selection-end="89" vertical-scroll-proportion="-1.8521595">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/carts_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="25" column="37" selection-start="653" selection-end="653" vertical-scroll-proportion="-0.5813953">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/views/users/show.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/views/orders/show.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="51" selection-start="619" selection-end="619" vertical-scroll-proportion="0.25757575">
+ <state line="20" column="3" selection-start="203" selection-end="203" vertical-scroll-proportion="-13.076923">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/wishlist_items/_wishlist_item.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/models/order.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/orders/thank_you.html.erb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="5" column="2" selection-start="175" selection-end="175" vertical-scroll-proportion="0.14309764">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/stylesheets/Street_Heart_Styles.css">
- <provider selected="true" editor-type-id="text-editor">
- <state line="917" column="19" selection-start="15839" selection-end="15839" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/wishlists_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="4" column="6" selection-start="1" selection-end="69" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/wishlist_items_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="4" column="2" selection-start="68" selection-end="68" vertical-scroll-proportion="0.10967742">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/admin_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1" column="59" selection-start="105" selection-end="105" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/welcome_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="2" column="31" selection-start="35" selection-end="35" vertical-scroll-proportion="0.05483871">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/models/user.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="3" selection-start="51" selection-end="165" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/users_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1" column="3" selection-start="3" selection-end="3" vertical-scroll-proportion="0.028006589">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/application_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="54" selection-start="919" selection-end="967" vertical-scroll-proportion="1.1241935">
-
- <folding />
- </state>
- </provider>
- </entry>
</component>
</project>
View
5 Gemfile
@@ -8,11 +8,10 @@ gem 'rails', '3.0.10'
gem 'sqlite3'
gem 'carrierwave'
-<<<<<<< HEAD
+
gem 'rmagick', '2.13.1'
-=======
->>>>>>> d85c137f4516417d1e2e6c8b46cbe2a37cd7c9ea
+
gem 'rmagick', '2.13.1', :require => 'RMagick'
# Use unicorn as the web server
View
5 app/views/orders/show.html.erb
@@ -18,6 +18,11 @@
<%= @order.pay_type %>
</p>
+<p>
+ <b>Line items:</b>
+ <%= render @order.line_items %>
+</p>
+
<%= link_to 'Edit', edit_order_path(@order) %> |
<%= link_to 'Back', orders_path %>
View
BIN db/development.sqlite3
Binary file not shown.
View
29 db/migrate/20111230152903_acts_as_taggable_on.rb
@@ -1,29 +0,0 @@
-class ActsAsTaggableOn < ActiveRecord::Migration
-def self.up
- create_table :tags do |t|
- t.column :name, :string
- end
-
- create_table :taggings do |t|
- t.column :tag_id, :integer
- t.column :taggable_id, :integer
- t.column :tagger_id, :integer
- t.column :tagger_type, :string
-
- # You should make sure that the column created is
- # long enough to store the required class names.
- t.column :taggable_type, :string
- t.column :context, :string
-
- t.column :created_at, :datetime
- end
-
- add_index :taggings, :tag_id
- add_index :taggings, [:taggable_id, :taggable_type, :context]
- end
-
- def self.down
- drop_table :taggings
- drop_table :tags
- end
-end
View
9 db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120104142722) do
+ActiveRecord::Schema.define(:version => 20120104220424) do
create_table "carts", :force => true do |t|
t.datetime "created_at"
@@ -88,6 +88,13 @@
add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+ create_table "tags", :force => true do |t|
+ t.string "name"
+ t.integer "product_id"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
create_table "users", :force => true do |t|
t.string "name"
t.string "hashed_password"

0 comments on commit a94c90c

Please sign in to comment.
Something went wrong with that request. Please try again.