shoppe 0.0.14 → 0.0.15

data/test/dummy/log/development.log

@@ -1085,3 +1085,78 @@ Migrating to AddNotesToOrders (20131021135208)
   SQL (1.7ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131021135208')
    (0.4ms)  COMMIT
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (11.5ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to RefactorOrderItemsToAllowAnyProduct (20131022090919)
+   (69.6ms)  ALTER TABLE `shoppe_order_items` CHANGE `product_id` `ordered_item_id` int(11) DEFAULT NULL
+   (28.9ms)  ALTER TABLE `shoppe_order_items` ADD `ordered_item_type` varchar(255)
+   (0.1ms)  BEGIN
+  SQL (6.0ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131022090919')
+   (0.3ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to RenameProductTitleToName (20131022092904)
+   (25.0ms)  ALTER TABLE `shoppe_products` CHANGE `title` `name` varchar(255) DEFAULT NULL
+   (0.1ms)  BEGIN
+  SQL (1.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131022092904')
+   (0.3ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to StockLevelAdjustmentsShouldBePolymorphic (20131022093538)
+   (25.5ms)  ALTER TABLE `shoppe_stock_level_adjustments` CHANGE `product_id` `item_id` int(11) DEFAULT NULL
+   (20.0ms)  ALTER TABLE `shoppe_stock_level_adjustments` ADD `item_type` varchar(255)
+   (0.1ms)  BEGIN
+  SQL (2.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131022093538')
+   (0.2ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+   (22.1ms)  DROP DATABASE IF EXISTS `shoppe_dummy`
+   (21.4ms)  DROP DATABASE IF EXISTS `shoppe_dummy_test`
+   (0.3ms)  CREATE DATABASE `shoppe_dummy` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (0.3ms)  CREATE DATABASE `shoppe_dummy_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (21.5ms)  CREATE TABLE `nifty_attachments` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `parent_id` int(11), `parent_type` varchar(255), `token` varchar(255), `digest` varchar(255), `role` varchar(255), `file_name` varchar(255), `file_type` varchar(255), `data` blob(16777215), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (26.6ms)  CREATE TABLE `nifty_key_value_store` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `parent_id` int(11), `parent_type` varchar(255), `group` varchar(255), `name` varchar(255), `value` varchar(255)) ENGINE=InnoDB
+   (13.8ms)  CREATE TABLE `shoppe_countries` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `code2` varchar(255), `code3` varchar(255), `continent` varchar(255), `tld` varchar(255), `currency` varchar(255), `eu_member` tinyint(1) DEFAULT 0) ENGINE=InnoDB
+   (21.7ms)  CREATE TABLE `shoppe_delivery_service_prices` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `delivery_service_id` int(11), `code` varchar(255), `price` decimal(8,2), `tax_rate_id` int(11), `min_weight` decimal(8,2), `max_weight` decimal(8,2), `created_at` datetime, `updated_at` datetime, `cost_price` decimal(8,2), `country_ids` text) ENGINE=InnoDB
+   (15.8ms)  CREATE TABLE `shoppe_delivery_services` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `code` varchar(255), `default` tinyint(1) DEFAULT 0, `active` tinyint(1) DEFAULT 1, `created_at` datetime, `updated_at` datetime, `courier` varchar(255), `tracking_url` varchar(255)) ENGINE=InnoDB
+   (20.6ms)  CREATE TABLE `shoppe_order_items` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `order_id` int(11), `ordered_item_id` int(11), `quantity` int(11) DEFAULT 1, `unit_price` decimal(8,2), `tax_amount` decimal(8,2), `tax_rate` decimal(8,2), `weight` decimal(8,3) DEFAULT 0.0, `created_at` datetime, `updated_at` datetime, `unit_cost_price` decimal(8,2), `ordered_item_type` varchar(255)) ENGINE=InnoDB
+   (14.4ms)  CREATE TABLE `shoppe_orders` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `token` varchar(255), `first_name` varchar(255), `last_name` varchar(255), `company` varchar(255), `address1` varchar(255), `address2` varchar(255), `address3` varchar(255), `address4` varchar(255), `postcode` varchar(255), `country_id` int(11), `email_address` varchar(255), `phone_number` varchar(255), `status` varchar(255), `received_at` datetime, `accepted_at` datetime, `shipped_at` datetime, `created_at` datetime, `updated_at` datetime, `delivery_service_id` int(11), `delivery_price` decimal(8,2), `delivery_tax_rate` decimal(8,2), `delivery_tax_amount` decimal(8,2), `paid_at` datetime, `accepted_by` int(11), `shipped_by` int(11), `consignment_number` varchar(255), `rejected_at` datetime, `rejected_by` int(11), `ip_address` varchar(255), `payment_reference` varchar(255), `payment_method` varchar(255), `delivery_cost_price` decimal(8,2), `notes` text) ENGINE=InnoDB
+   (16.6ms)  CREATE TABLE `shoppe_product_attributes` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `product_id` int(11), `key` varchar(255), `value` varchar(255), `position` int(11) DEFAULT 1, `searchable` tinyint(1) DEFAULT 1, `created_at` datetime, `updated_at` datetime, `public` tinyint(1) DEFAULT 1) ENGINE=InnoDB
+   (21.3ms)  CREATE TABLE `shoppe_product_categories` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `permalink` varchar(255), `description` text, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (21.9ms)  CREATE TABLE `shoppe_products` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `product_category_id` int(11), `name` varchar(255), `sku` varchar(255), `permalink` varchar(255), `description` text, `short_description` text, `active` tinyint(1) DEFAULT 1, `weight` decimal(8,3) DEFAULT 0.0, `price` decimal(8,2) DEFAULT 0.0, `tax_rate_id` int(11), `created_at` datetime, `updated_at` datetime, `featured` tinyint(1) DEFAULT 0, `in_the_box` text, `cost_price` decimal(8,2), `stock_control` tinyint(1) DEFAULT 1) ENGINE=InnoDB
+   (12.0ms)  CREATE TABLE `shoppe_stock_level_adjustments` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `item_id` int(11), `description` varchar(255), `adjustment` int(11) DEFAULT 0, `parent_type` varchar(255), `parent_id` int(11), `created_at` datetime, `updated_at` datetime, `item_type` varchar(255)) ENGINE=InnoDB
+   (15.0ms)  CREATE TABLE `shoppe_tax_rates` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `rate` decimal(8,2), `created_at` datetime, `updated_at` datetime, `country_ids` text) ENGINE=InnoDB
+   (16.5ms)  CREATE TABLE `shoppe_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `email_address` varchar(255), `password_digest` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (12.5ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (14.1ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`) 
+   (0.2ms)  SELECT version FROM `schema_migrations`
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131022093538')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131017165217')
+   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131017165222')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20130926094549')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131012123829')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131012163301')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131013123937')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131013131658')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131017144430')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131017180920')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131017183211')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131020204719')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131021135208')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131022090919')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20131022092904')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to AddParentIdToProducts (20131022135331)
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to AddParentIdToProducts (20131022135331)
+   (11.9ms)  ALTER TABLE `shoppe_products` ADD `parent_id` int(11) AFTER `id`
+   (0.1ms)  BEGIN
+  SQL (1.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131022135331')
+   (0.3ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to CostPriceShouldBeDefaultToZero (20131022145653)
+   (24.2ms)  ALTER TABLE `shoppe_products` CHANGE `cost_price` `cost_price` decimal(8,2) DEFAULT 0.0
+   (0.1ms)  BEGIN
+  SQL (1.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131022145653')
+   (0.3ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoppe
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -219,6 +219,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: nifty-dialog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -300,8 +316,10 @@ files:
 - app/assets/javascripts/shoppe/application.coffee
 - app/assets/javascripts/shoppe/chosen.jquery.js
 - app/assets/javascripts/shoppe/jquery_ui.js
+- app/assets/javascripts/shoppe/mousetrap.js
 - app/assets/stylesheets/shoppe/application.scss
 - app/assets/stylesheets/shoppe/chosen.css
+- app/assets/stylesheets/shoppe/dialog.scss
 - app/assets/stylesheets/shoppe/elements.scss
 - app/assets/stylesheets/shoppe/reset.scss
 - app/assets/stylesheets/shoppe/sub.scss
@@ -315,8 +333,10 @@ files:
 - app/controllers/shoppe/product_categories_controller.rb
 - app/controllers/shoppe/products_controller.rb
 - app/controllers/shoppe/sessions_controller.rb
+- app/controllers/shoppe/stock_level_adjustments_controller.rb
 - app/controllers/shoppe/tax_rates_controller.rb
 - app/controllers/shoppe/users_controller.rb
+- app/controllers/shoppe/variants_controller.rb
 - app/helpers/shoppe/application_helper.rb
 - app/helpers/shoppe/shoppe_helper.rb
 - app/mailers/shoppe/order_mailer.rb
@@ -327,6 +347,7 @@ files:
 - app/models/shoppe/order.rb
 - app/models/shoppe/order_item.rb
 - app/models/shoppe/product/product_attributes.rb
+- app/models/shoppe/product/variants.rb
 - app/models/shoppe/product.rb
 - app/models/shoppe/product_attribute.rb
 - app/models/shoppe/product_category.rb
@@ -354,12 +375,14 @@ files:
 - app/views/shoppe/product_categories/index.html.haml
 - app/views/shoppe/product_categories/new.html.haml
 - 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/index.html.haml
 - app/views/shoppe/products/new.html.haml
-- app/views/shoppe/products/stock_levels.html.haml
 - app/views/shoppe/sessions/new.html.haml
 - app/views/shoppe/sessions/reset.html.haml
+- app/views/shoppe/shared/error.html.haml
+- app/views/shoppe/stock_level_adjustments/index.html.haml
 - app/views/shoppe/tax_rates/form.html.haml
 - app/views/shoppe/tax_rates/index.html.haml
 - app/views/shoppe/user_mailer/new_password.text.erb
@@ -367,6 +390,8 @@ files:
 - app/views/shoppe/users/edit.html.haml
 - app/views/shoppe/users/index.html.haml
 - app/views/shoppe/users/new.html.haml
+- app/views/shoppe/variants/form.html.haml
+- app/views/shoppe/variants/index.html.haml
 - config/routes.rb
 - config/shoppe.example.yml
 - db/countries.txt
@@ -380,6 +405,11 @@ files:
 - db/migrate/20131017183211_create_shoppe_tax_rates.rb
 - db/migrate/20131020204719_add_countries_to_tax_rates_and_delivery_prices.rb
 - db/migrate/20131021135208_add_notes_to_orders.rb
+- db/migrate/20131022090919_refactor_order_items_to_allow_any_product.rb
+- db/migrate/20131022092904_rename_product_title_to_name.rb
+- db/migrate/20131022093538_stock_level_adjustments_should_be_polymorphic.rb
+- db/migrate/20131022135331_add_parent_id_to_products.rb
+- db/migrate/20131022145653_cost_price_should_be_default_to_zero.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg
 - db/seeds_data/snom-870-blk.jpg
@@ -402,6 +432,8 @@ files:
 - lib/shoppe/errors/invalid_configuration.rb
 - lib/shoppe/errors/not_enough_stock.rb
 - lib/shoppe/errors/payment_declined.rb
+- lib/shoppe/errors/unorderable_item.rb
+- lib/shoppe/orderable_item.rb
 - lib/shoppe/setup_generator.rb
 - lib/shoppe/version.rb
 - lib/shoppe.rb
@@ -465,7 +497,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -144390531799540250
+      hash: 404704541590521889
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -474,7 +506,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -144390531799540250
+      hash: 404704541590521889
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23