radiant-shop-extension 0.11.6 → 0.90.0

data/lib/tasks/shop_extension_tasks.rake

@@ -5,11 +5,16 @@ namespace :radiant do
       desc "Runs the migration of the Shop extension"
       task :migrate => :environment do
         require 'radiant/extension_migrator'
-        if ENV["VERSION"]
-          ShopExtension.migrator.migrate(ENV["VERSION"].to_i)
-        else
-          ShopExtension.migrator.migrate
+        
+        # Migrate required extensions first
+        ['Settings','Images','Forms','Scoped','Drag'].each do |name|
+          extension = "#{name}Extension".pluralize.classify.constantize
+          extension.migrator.migrate
         end
+        
+        version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+        ShopExtension.migrator.migrate(version)
+        
         Rake::Task['db:schema:dump'].invoke
       end
       

data/public/javascripts/admin/extensions/shop/products/edit.js

@@ -6,8 +6,6 @@ document.observe("dom:loaded", function() {
     '#image_form:submit'                  : function(e) { shop_product_edit.imageSubmit() },
     '#browse_images_popup .image:click'   : function(e) { shop_product_edit.imageAttach($(this)) },
     '#product_attachments .delete:click'  : function(e) { shop_product_edit.imageRemove($(this).up('.image')) },
-    
-    '#variants .delete:click'             : function(e) { shop_product_edit.variantRemove($(this).up('.variant')) }
   });
 });
 
@@ -84,29 +82,6 @@ var ShopProductEdit = Class.create({
     });
   },
   
-  variantRemove: function(element) {
-    var variant_id  = element.readAttribute('data-variant_id');
-    var route       = shop.getRoute('admin_shop_product_variant_path', 'js', variant_id);
-    
-    if(confirm('Are you Sure?')) {
-      showStatus('Removing Variant...');
-      element.hide();
-      
-      new Ajax.Request(route, { 
-        method: 'delete',
-        onSuccess: function(data) {
-          element.remove();
-        }.bind(element),
-        onFailure: function(data) {
-          element.show();
-        }.bind(element),
-        onComplete: function() {
-          hideStatus();        
-        }
-      });
-    }
-  },
-  
   imageSubmit: function() {
     showStatus('Uploading Image...');
   }

data/radiant-shop-extension.gemspec

@@ -5,67 +5,48 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.11.6"
+  s.version = "0.90.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dirk Kelly", "John Barker"]
-  s.date = %q{2010-10-14}
+  s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]
+  s.date = %q{2010-11-10}
   s.description = %q{Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [
-    "README.md"
+    "LICENSE",
+     "README.md"
   ]
   s.files = [
     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
      "HISTORY.md",
-     "MIT-LICENSE",
+     "LICENSE",
      "README.md",
      "Rakefile",
      "VERSION",
      "app/.DS_Store",
      "app/controllers/admin/shop/categories_controller.rb",
      "app/controllers/admin/shop/customers_controller.rb",
-     "app/controllers/admin/shop/discounts/discountables_controller.rb",
-     "app/controllers/admin/shop/discounts_controller.rb",
      "app/controllers/admin/shop/orders_controller.rb",
-     "app/controllers/admin/shop/packages/packings_controller.rb",
-     "app/controllers/admin/shop/packages_controller.rb",
      "app/controllers/admin/shop/products/images_controller.rb",
-     "app/controllers/admin/shop/products/variant_templates_controller.rb",
-     "app/controllers/admin/shop/products/variants_controller.rb",
      "app/controllers/admin/shop/products_controller.rb",
-     "app/controllers/admin/shop/variants_controller.rb",
      "app/controllers/admin/shops_controller.rb",
      "app/helpers/shop_helper.rb",
      "app/models/form_address.rb",
      "app/models/form_checkout.rb",
-     "app/models/form_discount.rb",
      "app/models/form_line_item.rb",
      "app/models/shop_address.rb",
      "app/models/shop_category.rb",
      "app/models/shop_category_page.rb",
      "app/models/shop_customer.rb",
-     "app/models/shop_discount.rb",
-     "app/models/shop_discountable.rb",
-     "app/models/shop_group.rb",
-     "app/models/shop_grouping.rb",
      "app/models/shop_line_item.rb",
      "app/models/shop_order.rb",
-     "app/models/shop_package.rb",
-     "app/models/shop_packing.rb",
      "app/models/shop_page.rb",
      "app/models/shop_payment.rb",
      "app/models/shop_product.rb",
      "app/models/shop_product_attachment.rb",
      "app/models/shop_product_page.rb",
-     "app/models/shop_product_variant.rb",
-     "app/models/shop_variant.rb",
      "app/views/.DS_Store",
      "app/views/admin/.DS_Store",
-     "app/views/admin/pages/_shop_category.html.haml",
-     "app/views/admin/pages/_shop_product.html.haml",
      "app/views/admin/shop/categories/edit.html.haml",
      "app/views/admin/shop/categories/edit/_foot.html.haml",
      "app/views/admin/shop/categories/edit/_form.html.haml",
@@ -78,6 +59,7 @@ Gem::Specification.new do |s|
      "app/views/admin/shop/categories/edit/meta/_handle.html.haml",
      "app/views/admin/shop/categories/edit/meta/_layouts.html.haml",
      "app/views/admin/shop/categories/edit/meta/_page.html.haml",
+     "app/views/admin/shop/categories/edit/meta/_status.html.haml",
      "app/views/admin/shop/categories/edit/parts/_description.html.haml",
      "app/views/admin/shop/categories/index/_category.html.haml",
      "app/views/admin/shop/categories/new.html.haml",
@@ -104,34 +86,6 @@ Gem::Specification.new do |s|
      "app/views/admin/shop/customers/index/_head.html.haml",
      "app/views/admin/shop/customers/new.html.haml",
      "app/views/admin/shop/customers/remove.html.haml",
-     "app/views/admin/shop/discounts/edit.html.haml",
-     "app/views/admin/shop/discounts/edit/_foot.html.haml",
-     "app/views/admin/shop/discounts/edit/_form.html.haml",
-     "app/views/admin/shop/discounts/edit/_head.html.haml",
-     "app/views/admin/shop/discounts/edit/_inputs.html.haml",
-     "app/views/admin/shop/discounts/edit/_meta.html.haml",
-     "app/views/admin/shop/discounts/edit/_parts.html.haml",
-     "app/views/admin/shop/discounts/edit/_popups.html.haml",
-     "app/views/admin/shop/discounts/edit/buttons/_browse_categories.html.haml",
-     "app/views/admin/shop/discounts/edit/buttons/_browse_products.html.haml",
-     "app/views/admin/shop/discounts/edit/inputs/_amount.html.haml",
-     "app/views/admin/shop/discounts/edit/inputs/_code.html.haml",
-     "app/views/admin/shop/discounts/edit/inputs/_name.html.haml",
-     "app/views/admin/shop/discounts/edit/meta/_finish.html.haml",
-     "app/views/admin/shop/discounts/edit/meta/_start.html.haml",
-     "app/views/admin/shop/discounts/edit/parts/_categories.html.haml",
-     "app/views/admin/shop/discounts/edit/parts/_products.html.haml",
-     "app/views/admin/shop/discounts/edit/popups/_browse_categories.html.haml",
-     "app/views/admin/shop/discounts/edit/popups/_browse_products.html.haml",
-     "app/views/admin/shop/discounts/edit/shared/_category.html.haml",
-     "app/views/admin/shop/discounts/edit/shared/_product.html.haml",
-     "app/views/admin/shop/discounts/index.html.haml",
-     "app/views/admin/shop/discounts/index/_discount.html.haml",
-     "app/views/admin/shop/discounts/index/_foot.html.haml",
-     "app/views/admin/shop/discounts/index/_head.html.haml",
-     "app/views/admin/shop/discounts/index/buttons/_new_discount.html.haml",
-     "app/views/admin/shop/discounts/new.html.haml",
-     "app/views/admin/shop/discounts/remove.html.haml",
      "app/views/admin/shop/orders/edit.html.haml",
      "app/views/admin/shop/orders/edit/_foot.html.haml",
      "app/views/admin/shop/orders/edit/_form.html.haml",
@@ -152,29 +106,6 @@ Gem::Specification.new do |s|
      "app/views/admin/shop/orders/index/buttons/_new.html.haml",
      "app/views/admin/shop/orders/index/buttons/_paid.html.haml",
      "app/views/admin/shop/orders/index/buttons/_shipped.html.haml",
-     "app/views/admin/shop/packages/edit.html.haml",
-     "app/views/admin/shop/packages/edit/_foot.html.haml",
-     "app/views/admin/shop/packages/edit/_form.html.haml",
-     "app/views/admin/shop/packages/edit/_head.html.haml",
-     "app/views/admin/shop/packages/edit/_inputs.html.haml",
-     "app/views/admin/shop/packages/edit/_meta.html.haml",
-     "app/views/admin/shop/packages/edit/_parts.html.haml",
-     "app/views/admin/shop/packages/edit/_popups.html.haml",
-     "app/views/admin/shop/packages/edit/buttons/_browse_products.html.haml",
-     "app/views/admin/shop/packages/edit/inputs/_name.html.haml",
-     "app/views/admin/shop/packages/edit/inputs/_price.html.haml",
-     "app/views/admin/shop/packages/edit/meta/_sku.html.haml",
-     "app/views/admin/shop/packages/edit/parts/_description.html.haml",
-     "app/views/admin/shop/packages/edit/parts/_products.html.haml",
-     "app/views/admin/shop/packages/edit/popups/_browse_products.html.haml",
-     "app/views/admin/shop/packages/edit/shared/_product.html.haml",
-     "app/views/admin/shop/packages/index.html.haml",
-     "app/views/admin/shop/packages/index/_foot.html.haml",
-     "app/views/admin/shop/packages/index/_head.html.haml",
-     "app/views/admin/shop/packages/index/_package.html.haml",
-     "app/views/admin/shop/packages/index/buttons/_new_package.html.haml",
-     "app/views/admin/shop/packages/new.html.haml",
-     "app/views/admin/shop/packages/remove.html.haml",
      "app/views/admin/shop/products/edit.html.haml",
      "app/views/admin/shop/products/edit/_foot.html.haml",
      "app/views/admin/shop/products/edit/_form.html.haml",
@@ -184,94 +115,44 @@ Gem::Specification.new do |s|
      "app/views/admin/shop/products/edit/_parts.html.haml",
      "app/views/admin/shop/products/edit/_popups.html.haml",
      "app/views/admin/shop/products/edit/buttons/_browse_images.html.haml",
-     "app/views/admin/shop/products/edit/buttons/_browse_templates.html.haml",
      "app/views/admin/shop/products/edit/buttons/_new_image.html.haml",
-     "app/views/admin/shop/products/edit/buttons/_new_variant.html.haml",
      "app/views/admin/shop/products/edit/inputs/_name.html.haml",
      "app/views/admin/shop/products/edit/inputs/_price.html.haml",
      "app/views/admin/shop/products/edit/meta/_category.html.haml",
+     "app/views/admin/shop/products/edit/meta/_layout.html.haml",
      "app/views/admin/shop/products/edit/meta/_page.html.haml",
      "app/views/admin/shop/products/edit/meta/_sku.html.haml",
+     "app/views/admin/shop/products/edit/meta/_status.html.haml",
      "app/views/admin/shop/products/edit/parts/_customers.html.haml",
      "app/views/admin/shop/products/edit/parts/_description.html.haml",
      "app/views/admin/shop/products/edit/parts/_images.html.haml",
-     "app/views/admin/shop/products/edit/parts/_variants.html.haml",
      "app/views/admin/shop/products/edit/popups/_browse_images.html.haml",
-     "app/views/admin/shop/products/edit/popups/_browse_templates.html.haml",
      "app/views/admin/shop/products/edit/popups/_new_image.html.haml",
-     "app/views/admin/shop/products/edit/popups/_new_variant.html.haml",
      "app/views/admin/shop/products/edit/shared/_image.html.haml",
-     "app/views/admin/shop/products/edit/shared/_template.html.haml",
-     "app/views/admin/shop/products/edit/shared/_variant.html.haml",
      "app/views/admin/shop/products/index.html.haml",
      "app/views/admin/shop/products/index/_foot.html.haml",
      "app/views/admin/shop/products/index/_head.html.haml",
      "app/views/admin/shop/products/index/_product.html.haml",
      "app/views/admin/shop/products/index/buttons/_add_category.html.haml",
-     "app/views/admin/shop/products/index/buttons/_variants.html.haml",
      "app/views/admin/shop/products/new.html.haml",
      "app/views/admin/shop/products/remove.html.haml",
-     "app/views/admin/shop/variants/edit.html.haml",
-     "app/views/admin/shop/variants/edit/_foot.html.haml",
-     "app/views/admin/shop/variants/edit/_form.html.haml",
-     "app/views/admin/shop/variants/edit/_head.html.haml",
-     "app/views/admin/shop/variants/edit/_inputs.html.haml",
-     "app/views/admin/shop/variants/edit/_meta.html.haml",
-     "app/views/admin/shop/variants/edit/_parts.html.haml",
-     "app/views/admin/shop/variants/edit/_popups.html.haml",
-     "app/views/admin/shop/variants/edit/inputs/_name.html.haml",
-     "app/views/admin/shop/variants/edit/inputs/_options.html.haml",
-     "app/views/admin/shop/variants/index.html.haml",
-     "app/views/admin/shop/variants/index/_foot.html.haml",
-     "app/views/admin/shop/variants/index/_head.html.haml",
-     "app/views/admin/shop/variants/index/_variant.html.haml",
-     "app/views/admin/shop/variants/index/buttons/_add_variant.html.haml",
-     "app/views/admin/shop/variants/index/buttons/_categories.html.haml",
-     "app/views/admin/shop/variants/new.html.haml",
-     "app/views/admin/shop/variants/remove.html.haml",
-     "app/views/shop/categories/show.html.haml",
-     "app/views/shop/orders/show.html.haml",
-     "app/views/shop/products/index.html.haml",
-     "app/views/shop/products/show.html.haml",
      "config/locales/en.yml",
      "config/routes.rb",
      "config/shop_cart.yml",
-     "cucumber.yml",
-     "db/migrate/20100311053701_initial.rb",
-     "db/migrate/20100927041219_remove_payment_methods.rb",
-     "db/migrate/20100927041624_change_payments_add_gateway.rb",
-     "db/migrate/20100927140446_change_payment_add_card_type_card_number.rb",
-     "db/migrate/20100929011106_fix_relationship_foreign_keys.rb",
-     "db/migrate/20100929011607_drop_shop_addressables.rb",
-     "db/migrate/20100929030510_create_shop_groups.rb",
-     "db/migrate/20100929080301_shop_groups_change_add_description.rb",
-     "db/migrate/20100929081200_create_variants.rb",
-     "db/migrate/20100929143531_change_variants_add_updated_by.rb",
-     "db/migrate/20100929145641_change_created_by_to_id.rb",
-     "db/migrate/20100929235221_change_category_add_variant_id.rb",
-     "db/migrate/20100930235221_create_packages.rb",
-     "db/migrate/20101005231713_create_page_ids.rb",
-     "db/migrate/20101006051214_create_pages_for_products_and_categories.rb",
-     "db/migrate/20101007111845_add_default_position_to_attachment.rb",
-     "db/migrate/20101010071143_create_discounts.rb",
-     "db/migrate/20101010072225_modify_categories_remove_variant.rb",
-     "db/migrate/20101010130034_change_discountables_add_observer.rb",
-     "db/migrate/20101011063133_change_orders_set_limits_to_null.rb",
+     "db/migrate/20101011063133_setup_shop.rb",
      "db/seed.rb",
      "db/seeds/forms.rb",
      "db/seeds/layouts.rb",
+     "db/seeds/pages.rb",
+     "db/seeds/products.rb",
      "db/seeds/snippets.rb",
-     "features/support/env.rb",
-     "features/support/paths.rb",
      "lib/shop/controllers/application_controller.rb",
      "lib/shop/controllers/site_controller.rb",
      "lib/shop/interface/categories.rb",
      "lib/shop/interface/customers.rb",
      "lib/shop/interface/discounts.rb",
      "lib/shop/interface/orders.rb",
-     "lib/shop/interface/packages.rb",
      "lib/shop/interface/products.rb",
-     "lib/shop/interface/variants.rb",
      "lib/shop/models/form_extension.rb",
      "lib/shop/models/image.rb",
      "lib/shop/models/page.rb",
@@ -283,57 +164,36 @@ Gem::Specification.new do |s|
      "lib/shop/tags/core.rb",
      "lib/shop/tags/helpers.rb",
      "lib/shop/tags/item.rb",
-     "lib/shop/tags/package.rb",
      "lib/shop/tags/product.rb",
-     "lib/shop/tags/product_variant.rb",
-     "lib/shop/tags/responses.rb",
      "lib/shop/tags/tax.rb",
      "lib/tasks/shop_extension_tasks.rake",
-     "mockups/balsamiq/products-retro_fun_tshirt-more.bmml",
-     "mockups/balsamiq/products-retro_fun_tshirt.bmml",
-     "mockups/discounts/new-edit.bmml",
      "public/images/admin/extensions/shop/products/sort.png",
-     "public/javascripts/admin/extensions/shop/discounts/edit.js",
      "public/javascripts/admin/extensions/shop/edit.js",
-     "public/javascripts/admin/extensions/shop/packages/edit.js",
      "public/javascripts/admin/extensions/shop/products/edit.js",
      "public/javascripts/admin/extensions/shop/products/index.js",
-     "public/stylesheets/sass/admin/extensions/shop/discounts/edit.sass",
      "public/stylesheets/sass/admin/extensions/shop/edit.sass",
      "public/stylesheets/sass/admin/extensions/shop/index.sass",
-     "public/stylesheets/sass/admin/extensions/shop/packages/edit.sass",
      "public/stylesheets/sass/admin/extensions/shop/products/edit.sass",
      "public/stylesheets/sass/admin/extensions/shop/products/index.sass",
      "radiant-shop-extension.gemspec",
      "shop_extension.rb",
      "spec/controllers/admin/shop/categories_controller_spec.rb",
      "spec/controllers/admin/shop/customers_controller_spec.rb",
-     "spec/controllers/admin/shop/discounts/discountables_controller_spec.rb",
-     "spec/controllers/admin/shop/discounts_controller_spec.rb",
      "spec/controllers/admin/shop/orders_controller_spec.rb",
-     "spec/controllers/admin/shop/packages/packings_controller_spec.rb",
-     "spec/controllers/admin/shop/packages_controller_spec.rb",
      "spec/controllers/admin/shop/products/images_controller_spec.rb",
-     "spec/controllers/admin/shop/products/variant_templates_controller_spec.rb",
-     "spec/controllers/admin/shop/products/variants_controller_spec.rb",
      "spec/controllers/admin/shop/products_controller_spec.rb",
-     "spec/controllers/admin/shop/variants_controller_spec.rb",
      "spec/controllers/admin/shops_controller_spec.rb",
      "spec/datasets/forms.rb",
      "spec/datasets/shop_addresses.rb",
      "spec/datasets/shop_categories.rb",
+     "spec/datasets/shop_config.rb",
      "spec/datasets/shop_customers.rb",
-     "spec/datasets/shop_discountables.rb",
-     "spec/datasets/shop_discounts.rb",
-     "spec/datasets/shop_groups.rb",
      "spec/datasets/shop_line_items.rb",
      "spec/datasets/shop_orders.rb",
-     "spec/datasets/shop_packages.rb",
      "spec/datasets/shop_payments.rb",
      "spec/datasets/shop_product_attachments.rb",
-     "spec/datasets/shop_product_variants.rb",
      "spec/datasets/shop_products.rb",
-     "spec/datasets/shop_variants.rb",
+     "spec/datasets/tags.rb",
      "spec/helpers/nested_tag_helper.rb",
      "spec/lib/shop/models/image_spec.rb",
      "spec/lib/shop/models/page_spec.rb",
@@ -344,33 +204,22 @@ Gem::Specification.new do |s|
      "spec/lib/shop/tags/core_spec.rb",
      "spec/lib/shop/tags/helpers_spec.rb",
      "spec/lib/shop/tags/item_spec.rb",
-     "spec/lib/shop/tags/package_spec.rb",
      "spec/lib/shop/tags/product_spec.rb",
-     "spec/lib/shop/tags/product_variant_spec.rb",
-     "spec/lib/shop/tags/responses_spec.rb",
      "spec/lib/shop/tags/tax_spec.rb",
      "spec/matchers/comparison.rb",
      "spec/matchers/render_matcher.rb",
      "spec/models/form_address_spec.rb",
      "spec/models/form_checkout_spec.rb",
-     "spec/models/form_discount_spec.rb",
      "spec/models/shop_address_spec.rb",
      "spec/models/shop_category_page_spec.rb",
      "spec/models/shop_category_spec.rb",
      "spec/models/shop_customer_spec.rb",
-     "spec/models/shop_discount_spec.rb",
-     "spec/models/shop_discountable_spec.rb",
-     "spec/models/shop_group_spec.rb",
      "spec/models/shop_line_item_spec.rb",
      "spec/models/shop_order_spec.rb",
-     "spec/models/shop_package_spec.rb",
-     "spec/models/shop_packing_spec.rb",
      "spec/models/shop_payment_spec.rb",
      "spec/models/shop_product_attachment_spec.rb",
      "spec/models/shop_product_page_spec.rb",
      "spec/models/shop_product_spec.rb",
-     "spec/models/shop_product_variant_spec.rb",
-     "spec/models/shop_variant_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "vendor/plugins/acts_as_list/README",
@@ -386,32 +235,21 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/controllers/admin/shop/categories_controller_spec.rb",
      "spec/controllers/admin/shop/customers_controller_spec.rb",
-     "spec/controllers/admin/shop/discounts/discountables_controller_spec.rb",
-     "spec/controllers/admin/shop/discounts_controller_spec.rb",
      "spec/controllers/admin/shop/orders_controller_spec.rb",
-     "spec/controllers/admin/shop/packages/packings_controller_spec.rb",
-     "spec/controllers/admin/shop/packages_controller_spec.rb",
      "spec/controllers/admin/shop/products/images_controller_spec.rb",
-     "spec/controllers/admin/shop/products/variant_templates_controller_spec.rb",
-     "spec/controllers/admin/shop/products/variants_controller_spec.rb",
      "spec/controllers/admin/shop/products_controller_spec.rb",
-     "spec/controllers/admin/shop/variants_controller_spec.rb",
      "spec/controllers/admin/shops_controller_spec.rb",
      "spec/datasets/forms.rb",
      "spec/datasets/shop_addresses.rb",
      "spec/datasets/shop_categories.rb",
+     "spec/datasets/shop_config.rb",
      "spec/datasets/shop_customers.rb",
-     "spec/datasets/shop_discountables.rb",
-     "spec/datasets/shop_discounts.rb",
-     "spec/datasets/shop_groups.rb",
      "spec/datasets/shop_line_items.rb",
      "spec/datasets/shop_orders.rb",
-     "spec/datasets/shop_packages.rb",
      "spec/datasets/shop_payments.rb",
      "spec/datasets/shop_product_attachments.rb",
-     "spec/datasets/shop_product_variants.rb",
      "spec/datasets/shop_products.rb",
-     "spec/datasets/shop_variants.rb",
+     "spec/datasets/tags.rb",
      "spec/helpers/nested_tag_helper.rb",
      "spec/lib/shop/models/image_spec.rb",
      "spec/lib/shop/models/page_spec.rb",
@@ -422,33 +260,22 @@ Gem::Specification.new do |s|
      "spec/lib/shop/tags/core_spec.rb",
      "spec/lib/shop/tags/helpers_spec.rb",
      "spec/lib/shop/tags/item_spec.rb",
-     "spec/lib/shop/tags/package_spec.rb",
      "spec/lib/shop/tags/product_spec.rb",
-     "spec/lib/shop/tags/product_variant_spec.rb",
-     "spec/lib/shop/tags/responses_spec.rb",
      "spec/lib/shop/tags/tax_spec.rb",
      "spec/matchers/comparison.rb",
      "spec/matchers/render_matcher.rb",
      "spec/models/form_address_spec.rb",
      "spec/models/form_checkout_spec.rb",
-     "spec/models/form_discount_spec.rb",
      "spec/models/shop_address_spec.rb",
      "spec/models/shop_category_page_spec.rb",
      "spec/models/shop_category_spec.rb",
      "spec/models/shop_customer_spec.rb",
-     "spec/models/shop_discount_spec.rb",
-     "spec/models/shop_discountable_spec.rb",
-     "spec/models/shop_group_spec.rb",
      "spec/models/shop_line_item_spec.rb",
      "spec/models/shop_order_spec.rb",
-     "spec/models/shop_package_spec.rb",
-     "spec/models/shop_packing_spec.rb",
      "spec/models/shop_payment_spec.rb",
      "spec/models/shop_product_attachment_spec.rb",
      "spec/models/shop_product_page_spec.rb",
      "spec/models/shop_product_spec.rb",
-     "spec/models/shop_product_variant_spec.rb",
-     "spec/models/shop_variant_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -460,32 +287,29 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<radiant>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<activemerchant>, [">= 1.8.0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 1.5.3"])
-      s.add_runtime_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
-      s.add_runtime_dependency(%q<radiant-images-extension>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<radiant-forms-extension>, [">= 3.1.1"])
-      s.add_runtime_dependency(%q<radiant-scoped-extension>, [">= 0.2.2"])
+      s.add_runtime_dependency(%q<radiant-images-extension>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<radiant-forms-extension>, [">= 3.2.1"])
+      s.add_runtime_dependency(%q<radiant-users-extension>, [">= 0.0.1"])
       s.add_runtime_dependency(%q<radiant-drag-extension>, [">= 0.1.0"])
     else
       s.add_dependency(%q<radiant>, [">= 0.9.1"])
       s.add_dependency(%q<activemerchant>, [">= 1.8.0"])
       s.add_dependency(%q<fastercsv>, [">= 1.5.3"])
-      s.add_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])
       s.add_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
-      s.add_dependency(%q<radiant-images-extension>, [">= 0.3.2"])
-      s.add_dependency(%q<radiant-forms-extension>, [">= 3.1.1"])
-      s.add_dependency(%q<radiant-scoped-extension>, [">= 0.2.2"])
+      s.add_dependency(%q<radiant-images-extension>, [">= 0.4.0"])
+      s.add_dependency(%q<radiant-forms-extension>, [">= 3.2.1"])
+      s.add_dependency(%q<radiant-users-extension>, [">= 0.0.1"])
       s.add_dependency(%q<radiant-drag-extension>, [">= 0.1.0"])
     end
   else
     s.add_dependency(%q<radiant>, [">= 0.9.1"])
     s.add_dependency(%q<activemerchant>, [">= 1.8.0"])
     s.add_dependency(%q<fastercsv>, [">= 1.5.3"])
-    s.add_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])
     s.add_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
-    s.add_dependency(%q<radiant-images-extension>, [">= 0.3.2"])
-    s.add_dependency(%q<radiant-forms-extension>, [">= 3.1.1"])
-    s.add_dependency(%q<radiant-scoped-extension>, [">= 0.2.2"])
+    s.add_dependency(%q<radiant-images-extension>, [">= 0.4.0"])
+    s.add_dependency(%q<radiant-forms-extension>, [">= 3.2.1"])
+    s.add_dependency(%q<radiant-users-extension>, [">= 0.0.1"])
     s.add_dependency(%q<radiant-drag-extension>, [">= 0.1.0"])
   end
 end

data/shop_extension.rb

@@ -4,36 +4,37 @@ class ShopExtension < Radiant::Extension
   url "http://github.com/squaretalent/radiant-shop-extension"
   
   extension_config do |config|
-    config.gem 'activemerchant', :lib => 'active_merchant'
-    config.gem 'fastercsv',      :lib => 'fastercsv'
+    config.gem 'activemerchant',              :lib => 'active_merchant'
+    config.gem 'fastercsv',                   :lib => 'fastercsv'
+    config.gem 'radiant-settings-extension',  :lib => false
+    config.gem 'radiant-users-extension',     :lib => false
+    config.gem 'radiant-images-extension',    :lib => false
+    config.gem 'radiant-forms-extension',     :lib => false
+    config.gem 'radiant-drag-extension',      :lib => false
   end
   
   UserActionObserver.instance.send :add_observer!, ShopCategory
-  UserActionObserver.instance.send :add_observer!, ShopDiscount
   UserActionObserver.instance.send :add_observer!, ShopOrder
-  UserActionObserver.instance.send :add_observer!, ShopPackage
   UserActionObserver.instance.send :add_observer!, ShopProduct
   UserActionObserver.instance.send :add_observer!, ShopProductAttachment
-  UserActionObserver.instance.send :add_observer!, ShopDiscountable
-  UserActionObserver.instance.send :add_observer!, ShopProductVariant
-  UserActionObserver.instance.send :add_observer!, ShopVariant
   
   def activate    
     # View Hooks
     unless defined? admin.products
-      Radiant::AdminUI.send :include, Shop::Interface::Categories, Shop::Interface::Customers, Shop::Interface::Discounts, Shop::Interface::Orders, Shop::Interface::Packages, Shop::Interface::Products, Shop::Interface::Variants
+      Radiant::AdminUI.send :include, Shop::Interface::Categories, Shop::Interface::Customers
+      Radiant::AdminUI.send :include, Shop::Interface::Discounts,  Shop::Interface::Orders,    Shop::Interface::Products
       
       admin.categories = Radiant::AdminUI.load_default_shop_categories_regions
       admin.customers  = Radiant::AdminUI.load_default_shop_customers_regions
       admin.discounts  = Radiant::AdminUI.load_default_shop_discounts_regions
-      admin.orders     = Radiant::AdminUI.load_default_shop_orders_regions
-      admin.packages   = Radiant::AdminUI.load_default_shop_packages_regions      
+      admin.orders     = Radiant::AdminUI.load_default_shop_orders_regions 
       admin.products   = Radiant::AdminUI.load_default_shop_products_regions
-      admin.variants   = Radiant::AdminUI.load_default_shop_variants_regions
     end
     
     # Tags
-    Page.send :include, Shop::Tags::Core, Shop::Tags::Address, Shop::Tags::Card, Shop::Tags::Cart, Shop::Tags::Category, Shop::Tags::Item, Shop::Tags::Package, Shop::Tags::Product, Shop::Tags::ProductVariant, Shop::Tags::Responses, Shop::Tags::Tax
+    Page.send :include, Shop::Tags::Core,     Shop::Tags::Address, Shop::Tags::Card,    Shop::Tags::Cart
+    Page.send :include, Shop::Tags::Category, Shop::Tags::Item,    Shop::Tags::Product
+    Page.send :include, Shop::Tags::Tax
     
     # Model Includes
     Page.send :include,  Shop::Models::Page
@@ -44,18 +45,14 @@ class ShopExtension < Radiant::Extension
     ApplicationController.send :include, Shop::Controllers::ApplicationController
     SiteController.send :include, Shop::Controllers::SiteController
     
-    # Tabs3
-    
+    # Tabs    
     tab "Shop" do
       add_item "Products",      "/admin/shop"
-      add_item "Packages",      "/admin/shop/packages"
       add_item "Orders",        "/admin/shop/orders"
-      add_item "Discounts",     "/admin/shop/discounts"
       add_item "Customers",     "/admin/shop/customers"
     end
     
-    Radiant::Config['shop.root_page_id']    ||= (Page.first(:conditions => { :slug => 'shop'}).id rescue (Page.first.id rescue nil))
-    Radiant::Config['shop.root_page_slug']  ||= 'shop'
+    Radiant::Config['shop.root_page_id']    ||= nil
     
     Radiant::Config['shop.layout_product']  ||= 'Product'
     Radiant::Config['shop.layout_category'] ||= 'Products'
@@ -65,10 +62,12 @@ class ShopExtension < Radiant::Extension
     Radiant::Config['shop.price_separator'] ||= '.'
     Radiant::Config['shop.price_delimiter'] ||= ','
     
-    Radiant::Config['shop.tax_strategy']    ||= 'inclusive' #exclusive
+    Radiant::Config['shop.tax_strategy']    ||= 'inclusive'
     Radiant::Config['shop.tax_percentage']  ||= '10'
     Radiant::Config['shop.tax_name']        ||= 'gst'
     
+    Radiant::Config['shop.date_format']     ||= '%d/%m/%Y'
+    
     # Scoped Customer Welcome Page
     Radiant::Config['scoped.customer.redirect'] = '/cart'
   end