shoppe 1.0.2 → 1.0.3

data/config/routes.rb

@@ -1,16 +1,24 @@
 Shoppe::Engine.routes.draw do
-  
+
   get 'attachment/:id/:filename.:extension' => 'attachments#show'
   resources :product_categories
   resources :products do
     resources :variants
+    collection do
+      get :import
+      post :import
+    end
   end
   resources :orders do
-    post :search, :on => :collection
-    post :accept, :on => :member
-    post :reject, :on => :member
-    post :ship, :on => :member
-    get :despatch_note, :on => :member
+    collection do
+      post :search
+    end
+    member do
+      post :accept
+      post :reject
+      post :ship
+      get :despatch_note
+    end
     resources :payments, :only => [:create, :destroy] do
       match :refund, :on => :member, :via => [:get, :post]
     end
@@ -26,11 +34,11 @@ Shoppe::Engine.routes.draw do
 
   get 'settings'=> 'settings#edit'
   post 'settings' => 'settings#update'
-  
+
   get 'login' => 'sessions#new'
   post 'login' => 'sessions#create'
   match 'login/reset' => 'sessions#reset', :via => [:get, :post]
-  
+
   delete 'logout' => 'sessions#destroy'
   root :to => 'dashboard#home'
 end

data/db/migrate/20141026175622_add_indexes_to_shoppe_order_items.rb

@@ -0,0 +1,6 @@
+class AddIndexesToShoppeOrderItems < ActiveRecord::Migration
+  def change
+    add_index :shoppe_order_items, [:ordered_item_id, :ordered_item_type], name: 'index_shoppe_order_items_ordered_item'
+    add_index :shoppe_order_items, :order_id
+  end
+end

data/db/migrate/20141026175943_add_indexes_to_shoppe_orders.rb

@@ -0,0 +1,7 @@
+class AddIndexesToShoppeOrders < ActiveRecord::Migration
+  def change
+    add_index :shoppe_orders, :token
+    add_index :shoppe_orders, :delivery_service_id
+    add_index :shoppe_orders, :received_at
+  end
+end

data/db/migrate/20141026180333_add_indexes_to_shoppe_payments.rb

@@ -0,0 +1,6 @@
+class AddIndexesToShoppePayments < ActiveRecord::Migration
+  def change
+    add_index :shoppe_payments, :order_id
+    add_index :shoppe_payments, :parent_payment_id
+  end
+end

data/db/migrate/20141026180835_add_indexes_to_shoppe_product_attributes.rb

@@ -0,0 +1,7 @@
+class AddIndexesToShoppeProductAttributes < ActiveRecord::Migration
+  def change
+    add_index :shoppe_product_attributes, :product_id
+    add_index :shoppe_product_attributes, :key
+    add_index :shoppe_product_attributes, :position
+  end
+end

data/db/migrate/20141026180952_add_indexes_to_shoppe_product_categories.rb

@@ -0,0 +1,5 @@
+class AddIndexesToShoppeProductCategories < ActiveRecord::Migration
+  def change
+    add_index :shoppe_product_categories, :permalink
+  end
+end

data/db/migrate/20141026181040_add_indexes_to_shoppe_products.rb

@@ -0,0 +1,8 @@
+class AddIndexesToShoppeProducts < ActiveRecord::Migration
+  def change
+    add_index :shoppe_products, :parent_id
+    add_index :shoppe_products, :sku
+    add_index :shoppe_products, :product_category_id
+    add_index :shoppe_products, :permalink
+  end
+end

data/db/migrate/20141026181312_add_indexes_to_shoppe_settings.rb

@@ -0,0 +1,5 @@
+class AddIndexesToShoppeSettings < ActiveRecord::Migration
+  def change
+    add_index :shoppe_settings, :key
+  end
+end

data/db/migrate/20141026181354_add_indexes_to_shoppe_stock_level_adjustments.rb

@@ -0,0 +1,6 @@
+class AddIndexesToShoppeStockLevelAdjustments < ActiveRecord::Migration
+  def change
+    add_index :shoppe_stock_level_adjustments, [:item_id, :item_type], name: 'index_shoppe_stock_level_adjustments_items'
+    add_index :shoppe_stock_level_adjustments, [:parent_id, :parent_type], name: 'index_shoppe_stock_level_adjustments_parent'
+  end
+end

data/db/migrate/20141026181559_add_indexes_to_shoppe_users.rb

@@ -0,0 +1,5 @@
+class AddIndexesToShoppeUsers < ActiveRecord::Migration
+  def change
+    add_index :shoppe_users, :email_address
+  end
+end

data/db/migrate/20141026181716_add_indexes_to_shoppe_delivery_services.rb

@@ -0,0 +1,9 @@
+class AddIndexesToShoppeDeliveryServices < ActiveRecord::Migration
+  def change
+    add_index :shoppe_delivery_services, :active
+    add_index :shoppe_delivery_service_prices, :delivery_service_id
+    add_index :shoppe_delivery_service_prices, :min_weight
+    add_index :shoppe_delivery_service_prices, :max_weight
+    add_index :shoppe_delivery_service_prices, :price
+  end
+end

data/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: 20131102143930) do
+ActiveRecord::Schema.define(version: 20141026181716) do
 
   create_table "nifty_attachments", force: true do |t|
     t.integer  "parent_id"
@@ -57,6 +57,11 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.text     "country_ids"
   end
 
+  add_index "shoppe_delivery_service_prices", ["delivery_service_id"], name: "index_shoppe_delivery_service_prices_on_delivery_service_id", using: :btree
+  add_index "shoppe_delivery_service_prices", ["max_weight"], name: "index_shoppe_delivery_service_prices_on_max_weight", using: :btree
+  add_index "shoppe_delivery_service_prices", ["min_weight"], name: "index_shoppe_delivery_service_prices_on_min_weight", using: :btree
+  add_index "shoppe_delivery_service_prices", ["price"], name: "index_shoppe_delivery_service_prices_on_price", using: :btree
+
   create_table "shoppe_delivery_services", force: true do |t|
     t.string   "name"
     t.string   "code"
@@ -68,6 +73,8 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.string   "tracking_url"
   end
 
+  add_index "shoppe_delivery_services", ["active"], name: "index_shoppe_delivery_services_on_active", using: :btree
+
   create_table "shoppe_order_items", force: true do |t|
     t.integer  "order_id"
     t.integer  "ordered_item_id"
@@ -82,6 +89,9 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.datetime "updated_at"
   end
 
+  add_index "shoppe_order_items", ["order_id"], name: "index_shoppe_order_items_on_order_id", using: :btree
+  add_index "shoppe_order_items", ["ordered_item_id", "ordered_item_type"], name: "index_shoppe_order_items_ordered_item", using: :btree
+
   create_table "shoppe_orders", force: true do |t|
     t.string   "token"
     t.string   "first_name"
@@ -126,6 +136,10 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.string   "invoice_number"
   end
 
+  add_index "shoppe_orders", ["delivery_service_id"], name: "index_shoppe_orders_on_delivery_service_id", using: :btree
+  add_index "shoppe_orders", ["received_at"], name: "index_shoppe_orders_on_received_at", using: :btree
+  add_index "shoppe_orders", ["token"], name: "index_shoppe_orders_on_token", using: :btree
+
   create_table "shoppe_payments", force: true do |t|
     t.integer  "order_id"
     t.decimal  "amount",            precision: 8, scale: 2, default: 0.0
@@ -140,6 +154,9 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.datetime "updated_at"
   end
 
+  add_index "shoppe_payments", ["order_id"], name: "index_shoppe_payments_on_order_id", using: :btree
+  add_index "shoppe_payments", ["parent_payment_id"], name: "index_shoppe_payments_on_parent_payment_id", using: :btree
+
   create_table "shoppe_product_attributes", force: true do |t|
     t.integer  "product_id"
     t.string   "key"
@@ -151,6 +168,10 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.boolean  "public",     default: true
   end
 
+  add_index "shoppe_product_attributes", ["key"], name: "index_shoppe_product_attributes_on_key", using: :btree
+  add_index "shoppe_product_attributes", ["position"], name: "index_shoppe_product_attributes_on_position", using: :btree
+  add_index "shoppe_product_attributes", ["product_id"], name: "index_shoppe_product_attributes_on_product_id", using: :btree
+
   create_table "shoppe_product_categories", force: true do |t|
     t.string   "name"
     t.string   "permalink"
@@ -159,6 +180,8 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.datetime "updated_at"
   end
 
+  add_index "shoppe_product_categories", ["permalink"], name: "index_shoppe_product_categories_on_permalink", using: :btree
+
   create_table "shoppe_products", force: true do |t|
     t.integer  "parent_id"
     t.integer  "product_category_id"
@@ -180,12 +203,19 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.boolean  "default",                                     default: false
   end
 
+  add_index "shoppe_products", ["parent_id"], name: "index_shoppe_products_on_parent_id", using: :btree
+  add_index "shoppe_products", ["permalink"], name: "index_shoppe_products_on_permalink", using: :btree
+  add_index "shoppe_products", ["product_category_id"], name: "index_shoppe_products_on_product_category_id", using: :btree
+  add_index "shoppe_products", ["sku"], name: "index_shoppe_products_on_sku", using: :btree
+
   create_table "shoppe_settings", force: true do |t|
     t.string "key"
     t.string "value"
     t.string "value_type"
   end
 
+  add_index "shoppe_settings", ["key"], name: "index_shoppe_settings_on_key", using: :btree
+
   create_table "shoppe_stock_level_adjustments", force: true do |t|
     t.integer  "item_id"
     t.string   "item_type"
@@ -197,6 +227,9 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.datetime "updated_at"
   end
 
+  add_index "shoppe_stock_level_adjustments", ["item_id", "item_type"], name: "index_shoppe_stock_level_adjustments_items", using: :btree
+  add_index "shoppe_stock_level_adjustments", ["parent_id", "parent_type"], name: "index_shoppe_stock_level_adjustments_parent", using: :btree
+
   create_table "shoppe_tax_rates", force: true do |t|
     t.string   "name"
     t.decimal  "rate",         precision: 8, scale: 2
@@ -215,4 +248,6 @@ ActiveRecord::Schema.define(version: 20131102143930) do
     t.datetime "updated_at"
   end
 
+  add_index "shoppe_users", ["email_address"], name: "index_shoppe_users_on_email_address", using: :btree
+
 end

data/lib/shoppe/engine.rb

@@ -15,6 +15,12 @@ module Shoppe
       g.javascripts     false
       g.helper          false
     end
+
+    config.to_prepare do
+      Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
+        require_dependency(c)
+      end
+    end
     
     initializer 'shoppe.initialize' do |app|
       # Add the default settings

data/lib/shoppe/navigation_manager.rb

@@ -44,7 +44,7 @@ module Shoppe
     end
     
     def remove_item(identifier)
-      items.remote_if { |i| i.identifier.to_s == identifier.to_s }
+      items.delete_if { |i| i.identifier.to_s == identifier.to_s }
     end
     
     class NavigationItem

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoppe
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -50,6 +50,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +200,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: roo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: nifty-key-value-store
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +280,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.7
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.7
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -380,6 +426,7 @@ files:
 - app/assets/images/shoppe/statuses/received.svg
 - app/assets/images/shoppe/statuses/rejected.svg
 - app/assets/images/shoppe/statuses/shipped.svg
+- app/assets/images/shoppe/table-tear-off.png
 - app/assets/javascripts/shoppe/application.coffee
 - app/assets/javascripts/shoppe/chosen.jquery.js
 - app/assets/javascripts/shoppe/jquery_ui.js
@@ -431,6 +478,7 @@ files:
 - app/models/shoppe/stock_level_adjustment.rb
 - app/models/shoppe/tax_rate.rb
 - app/models/shoppe/user.rb
+- app/validators/permalink_validator.rb
 - app/views/layouts/shoppe/application.html.haml
 - app/views/layouts/shoppe/printable.html.haml
 - app/views/layouts/shoppe/sub.html.haml
@@ -471,6 +519,7 @@ files:
 - app/views/shoppe/products/_form.html.haml
 - app/views/shoppe/products/_table.html.haml
 - app/views/shoppe/products/edit.html.haml
+- app/views/shoppe/products/import.html.haml
 - app/views/shoppe/products/index.html.haml
 - app/views/shoppe/products/new.html.haml
 - app/views/shoppe/sessions/new.html.haml
@@ -488,12 +537,25 @@ files:
 - app/views/shoppe/variants/form.html.haml
 - app/views/shoppe/variants/index.html.haml
 - config/locales/en.yml
+- config/locales/es.yml
+- config/locales/pl.yml
+- config/locales/pt-BR.yml
 - config/routes.rb
 - db/countries.txt
 - db/migrate/20130926094549_create_shoppe_initial_schema.rb
 - db/migrate/20131024201501_add_address_type_to_shoppe_tax_rates.rb
 - db/migrate/20131024204815_create_shoppe_payments.rb
 - db/migrate/20131102143930_remove_default_on_order_item_weight.rb
+- db/migrate/20141026175622_add_indexes_to_shoppe_order_items.rb
+- db/migrate/20141026175943_add_indexes_to_shoppe_orders.rb
+- db/migrate/20141026180333_add_indexes_to_shoppe_payments.rb
+- db/migrate/20141026180835_add_indexes_to_shoppe_product_attributes.rb
+- db/migrate/20141026180952_add_indexes_to_shoppe_product_categories.rb
+- db/migrate/20141026181040_add_indexes_to_shoppe_products.rb
+- db/migrate/20141026181312_add_indexes_to_shoppe_settings.rb
+- db/migrate/20141026181354_add_indexes_to_shoppe_stock_level_adjustments.rb
+- db/migrate/20141026181559_add_indexes_to_shoppe_users.rb
+- db/migrate/20141026181716_add_indexes_to_shoppe_delivery_services.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg