OSDN Git Service

エレコマ2.0対応:多店舗対応 DEV_2.0
authorTaro Matsuzawa <tmatsuzawa@kbmj.com>
Sun, 9 May 2010 17:12:32 +0000 (02:12 +0900)
committerTaro Matsuzawa <tmatsuzawa@kbmj.com>
Sun, 9 May 2010 17:12:32 +0000 (02:12 +0900)
commit060594f3802e539c3e16f9d692938052475fbc0a
treea1977ef40fff2fb2ef5fcaffa737b5f997a0421b
parentb968d52196e53ccb5c87085a6adf85246c628f72
エレコマ2.0対応:多店舗対応
69 files changed:
app/controllers/admin/admin_users_controller.rb
app/controllers/admin/authorities_controller.rb
app/controllers/admin/campaigns_controller.rb
app/controllers/admin/categories_controller.rb
app/controllers/admin/customers_controller.rb
app/controllers/admin/designs_controller.rb
app/controllers/admin/feature_products_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/admin/home_controller.rb
app/controllers/admin/mail_magazine_templates_controller.rb
app/controllers/admin/mail_magazines_controller.rb
app/controllers/admin/new_informations_controller.rb
app/controllers/admin/products_controller.rb
app/controllers/admin/questionnaires_controller.rb
app/controllers/admin/recommend_products_controller.rb
app/controllers/admin/retailers_controller.rb
app/controllers/admin/return_items_controller.rb
app/controllers/admin/shops_controller.rb
app/controllers/admin/stock_base_controller.rb
app/controllers/admin/stock_csv_controller.rb
app/controllers/admin/stock_histories_controller.rb
app/controllers/cart_controller.rb
app/controllers/products_controller.rb
app/controllers/retailers_controller.rb
app/models/customer_search_form.rb
app/models/google_analytics_item.rb
app/models/order_delivery.rb
app/models/retailer.rb
app/views/admin/base/_product_submenu.html.erb
app/views/admin/base/_shop_submenu.html.erb
app/views/admin/retailers/_form.html.erb
app/views/admin/retailers/edit.html.erb
app/views/base/_googleanalytics_asynchronous.html.erb
app/views/base/_googleanalytics_synchronous.html.erb
app/views/cart/_set_delivery_each_retailer.html.erb
app/views/cart/_set_delivery_each_retailer_mobile.html.erb
app/views/cart/_set_point_each_retailer.html.erb
app/views/cart/complete.html.erb
app/views/cart/confirm.html.erb
app/views/cart/confirm_mobile.html.erb
app/views/cart/purchase.html.erb
app/views/cart/purchase_mobile.html.erb
app/views/cart/temporary_shipping.html.erb
app/views/layouts/admin/base.html.erb
app/views/products/index.html.erb
app/views/retailers/index.html.erb
config/routes.rb
db/migrate/20100405091645_add_columns_to_retailers.rb [new file with mode: 0644]
public/images/.DS_Store [new file with mode: 0644]
public/javascripts/cart_delivery.js
public/stylesheets/front/cart.css
public/stylesheets/front/retailer.css
spec/controllers/admin/admin_users_controller_spec.rb
spec/controllers/admin/authorities_controller_spec.rb
spec/controllers/admin/campaigns_controller_spec.rb
spec/controllers/admin/categories_controller_spec.rb
spec/controllers/admin/designs_controller_spec.rb
spec/controllers/admin/feature_products_controller_spec.rb
spec/controllers/admin/features_controller_spec.rb
spec/controllers/admin/home_controller_spec.rb
spec/controllers/admin/mail_magazine_templates_controller_spec.rb
spec/controllers/admin/mail_magazines_controller_spec.rb
spec/controllers/admin/new_informations_controller_spec.rb
spec/controllers/admin/questionnaires_controller_spec.rb
spec/controllers/admin/recommend_products_controller_spec.rb
spec/controllers/admin/retailers_controller_spec.rb
spec/controllers/admin/shops_controller_spec.rb
spec/controllers/cart_controller_spec.rb
spec/models/campaign_spec.rb