shoppe 1.0.7 → 1.0.8

data/config/routes.rb

@@ -1,9 +1,18 @@
 Shoppe::Engine.routes.draw do
 
   get 'attachment/:id/:filename.:extension' => 'attachments#show'
-  resources :product_categories
+
+  resources :customers do
+    post :search, :on => :collection
+    resources :addresses
+  end
+  
+  resources :product_categories do
+    resources :localisations, controller: "product_category_localisations"
+  end
   resources :products do
     resources :variants
+    resources :localisations, controller: "product_localisations"
     collection do
       get :import
       post :import

data/db/migrate/20141013192427_create_shoppe_customers.rb

@@ -0,0 +1,14 @@
+class CreateShoppeCustomers < ActiveRecord::Migration
+  def change
+    create_table :shoppe_customers do |t|
+      t.string :first_name
+      t.string :last_name
+      t.string :company
+      t.string :email
+      t.string :phone
+      t.string :mobile
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20141027215005_create_shoppe_addresses.rb

@@ -0,0 +1,17 @@
+class CreateShoppeAddresses < ActiveRecord::Migration
+  def change
+    create_table :shoppe_addresses do |t|
+      t.belongs_to :customer, index: true
+      t.string :address_type
+      t.boolean :default
+      t.string :address1
+      t.string :address2
+      t.string :address3
+      t.string :address4
+      t.string :postcode
+      t.integer :country_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20150315215633_add_customer_to_shoppe_orders.rb

@@ -0,0 +1,5 @@
+class AddCustomerToShoppeOrders < ActiveRecord::Migration
+  def change
+    add_column :shoppe_orders, :customer_id, :integer
+  end
+end

data/db/migrate/20150513171350_create_shoppe_product_category_translation_table.rb

@@ -0,0 +1,17 @@
+class CreateShoppeProductCategoryTranslationTable < ActiveRecord::Migration
+  def up
+    Shoppe::ProductCategory.create_translation_table! :name => :string, :permalink => :string, :description => :text
+
+    Shoppe::ProductCategory.all.each do |pc|
+      l = pc.translations.new
+      l.locale = "en"
+      l.name = pc.name
+      l.permalink = pc.permalink
+      l.description = pc.description
+      l.save!
+    end
+  end
+  def down
+    Shoppe::ProductCategory.drop_translation_table!
+  end
+end

data/db/migrate/20150519173350_create_shoppe_product_translation_table.rb

@@ -0,0 +1,18 @@
+class CreateShoppeProductTranslationTable < ActiveRecord::Migration
+  def up
+    Shoppe::Product.create_translation_table! :name => :string, :permalink => :string, :description => :text, :short_description => :text
+
+    Shoppe::Product.all.each do |p|
+      l = p.translations.new
+      l.locale = "en"
+      l.name = p.name
+      l.permalink = p.permalink
+      l.description = p.description
+      l.short_description = p.short_description
+      l.save!
+    end
+  end
+  def down
+    Shoppe::Product.drop_translation_table!
+  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: 20141026181718) do
+ActiveRecord::Schema.define(version: 20150315223628) do
 
   create_table "nifty_attachments", force: true do |t|
     t.integer  "parent_id"
@@ -34,6 +34,35 @@ ActiveRecord::Schema.define(version: 20141026181718) do
     t.string  "value"
   end
 
+  create_table "shoppe_addresses", force: true do |t|
+    t.integer  "customer_id"
+    t.string   "address_type"
+    t.boolean  "default"
+    t.string   "address1"
+    t.string   "address2"
+    t.string   "address3"
+    t.string   "address4"
+    t.string   "postcode"
+    t.integer  "country_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "shoppe_addresses", ["customer_id"], name: "index_shoppe_addresses_on_customer_id", using: :btree
+
+  create_table "shoppe_attachments", force: true do |t|
+    t.integer  "parent_id",   null: false
+    t.string   "parent_type", null: false
+    t.string   "token"
+    t.string   "file",        null: false
+    t.string   "file_name"
+    t.integer  "file_size"
+    t.string   "file_type"
+    t.string   "role"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "shoppe_countries", force: true do |t|
     t.string  "name"
     t.string  "code2"
@@ -44,6 +73,17 @@ ActiveRecord::Schema.define(version: 20141026181718) do
     t.boolean "eu_member", default: false
   end
 
+  create_table "shoppe_customers", force: true do |t|
+    t.string   "first_name"
+    t.string   "last_name"
+    t.string   "company"
+    t.string   "email"
+    t.string   "phone"
+    t.string   "mobile"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "shoppe_delivery_service_prices", force: true do |t|
     t.integer  "delivery_service_id"
     t.string   "code"
@@ -134,6 +174,7 @@ ActiveRecord::Schema.define(version: 20141026181718) do
     t.decimal  "amount_paid",               precision: 8, scale: 2, default: 0.0
     t.boolean  "exported",                                          default: false
     t.string   "invoice_number"
+    t.integer  "customer_id"
   end
 
   add_index "shoppe_orders", ["delivery_service_id"], name: "index_shoppe_orders_on_delivery_service_id", using: :btree

data/lib/shoppe.rb

@@ -6,6 +6,7 @@ require 'bcrypt'
 require 'dynamic_form'
 require 'kaminari'
 require 'ransack'
+require "globalize"
 
 require 'nifty/utils'
 require 'nifty/key_value_store'

data/lib/shoppe/default_navigation.rb

@@ -9,6 +9,7 @@ require 'shoppe/navigation_manager'
 # This is the default navigation manager for the admin interface. 
 #
 Shoppe::NavigationManager.build(:admin_primary) do
+  add_item :customers
   add_item :orders
   add_item :products
   add_item :product_categories

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoppe
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,6 +184,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: globalize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nifty-key-value-store
   requirement: !ruby/object:Gem::Requirement
@@ -439,15 +453,19 @@ files:
 - app/assets/stylesheets/shoppe/reset.scss
 - app/assets/stylesheets/shoppe/sub.scss
 - app/assets/stylesheets/shoppe/variables.scss
+- app/controllers/shoppe/addresses_controller.rb
 - app/controllers/shoppe/application_controller.rb
 - app/controllers/shoppe/attachments_controller.rb
 - app/controllers/shoppe/countries_controller.rb
+- app/controllers/shoppe/customers_controller.rb
 - app/controllers/shoppe/dashboard_controller.rb
 - app/controllers/shoppe/delivery_service_prices_controller.rb
 - app/controllers/shoppe/delivery_services_controller.rb
 - app/controllers/shoppe/orders_controller.rb
 - app/controllers/shoppe/payments_controller.rb
 - app/controllers/shoppe/product_categories_controller.rb
+- app/controllers/shoppe/product_category_localisations_controller.rb
+- app/controllers/shoppe/product_localisations_controller.rb
 - app/controllers/shoppe/products_controller.rb
 - app/controllers/shoppe/sessions_controller.rb
 - app/controllers/shoppe/settings_controller.rb
@@ -459,7 +477,9 @@ files:
 - app/helpers/shoppe/product_category_helper.rb
 - app/mailers/shoppe/order_mailer.rb
 - app/mailers/shoppe/user_mailer.rb
+- app/models/shoppe/address.rb
 - app/models/shoppe/country.rb
+- app/models/shoppe/customer.rb
 - app/models/shoppe/delivery_service.rb
 - app/models/shoppe/delivery_service_price.rb
 - app/models/shoppe/order.rb
@@ -483,10 +503,20 @@ files:
 - app/views/layouts/shoppe/application.html.haml
 - app/views/layouts/shoppe/printable.html.haml
 - app/views/layouts/shoppe/sub.html.haml
+- app/views/shoppe/addresses/_form.html.haml
+- app/views/shoppe/addresses/edit.html.haml
+- app/views/shoppe/addresses/new.html.haml
 - app/views/shoppe/countries/_form.html.haml
 - app/views/shoppe/countries/edit.html.haml
 - app/views/shoppe/countries/index.html.haml
 - app/views/shoppe/countries/new.html.haml
+- app/views/shoppe/customers/_addresses.html.haml
+- app/views/shoppe/customers/_form.html.haml
+- app/views/shoppe/customers/_search_form.html.haml
+- app/views/shoppe/customers/edit.html.haml
+- app/views/shoppe/customers/index.html.haml
+- app/views/shoppe/customers/new.html.haml
+- app/views/shoppe/customers/show.html.haml
 - app/views/shoppe/delivery_service_prices/_form.html.haml
 - app/views/shoppe/delivery_service_prices/edit.html.haml
 - app/views/shoppe/delivery_service_prices/index.html.haml
@@ -517,6 +547,10 @@ files:
 - app/views/shoppe/product_categories/edit.html.haml
 - app/views/shoppe/product_categories/index.html.haml
 - app/views/shoppe/product_categories/new.html.haml
+- app/views/shoppe/product_category_localisations/form.html.haml
+- app/views/shoppe/product_category_localisations/index.html.haml
+- app/views/shoppe/product_localisations/form.html.haml
+- app/views/shoppe/product_localisations/index.html.haml
 - app/views/shoppe/products/_form.html.haml
 - app/views/shoppe/products/_table.html.haml
 - app/views/shoppe/products/edit.html.haml
@@ -548,6 +582,7 @@ files:
 - 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/20141013192427_create_shoppe_customers.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
@@ -560,6 +595,10 @@ files:
 - db/migrate/20141026181716_add_indexes_to_shoppe_delivery_services.rb
 - db/migrate/20141026181717_allow_multiple_shoppe_products_per_shoppe_product_category.rb
 - db/migrate/20141026181718_add_nested_to_product_categories.rb
+- db/migrate/20141027215005_create_shoppe_addresses.rb
+- db/migrate/20150315215633_add_customer_to_shoppe_orders.rb
+- db/migrate/20150513171350_create_shoppe_product_category_translation_table.rb
+- db/migrate/20150519173350_create_shoppe_product_translation_table.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg