radiant-shop-extension 0.11.5 → 0.11.6

data/spec/models/shop_product_spec.rb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 
 describe ShopProduct do
-  dataset :shop_products, :shop_line_items
+  dataset :shop_products, :shop_line_items, :shop_discountables
   
   describe 'relationships' do
     before :each do
@@ -53,6 +53,15 @@ describe ShopProduct do
     it 'should have many variants' do
       @product.variants.is_a?(Array).should be_true
     end
+    
+    it 'should have many discountables' do
+      @product.discountables.is_a?(Array).should be_true
+    end
+    
+    it 'should have many discounts' do
+      @product.discounts.is_a?(Array).should be_true
+    end
+    
   end
   
   describe 'validations' do
@@ -173,6 +182,7 @@ describe ShopProduct do
           @product.page.slug.should === 'delicious_______________bread'
         end
       end
+      
       context 'breadcrumb' do
         context 'has not been set' do
           it 'should generate from the slug on validation' do
@@ -191,6 +201,25 @@ describe ShopProduct do
         end
       end
     end
+    
+    context 'discounts' do
+      context 'after_create' do
+        it 'should assign its categories discounts to itself' do
+          @product = ShopProduct.new(
+            :price => 11.11,
+            :page_attributes => {
+              :title => 'New Page With Discounts',
+              :slug  => 'new_page_with_discounts',
+              :parent_id => shop_categories(:bread).id
+            } 
+          )
+          @product.discounts.empty?.should === true
+          @product.save
+          
+          ShopProduct.find(@product).discounts.should === shop_categories(:bread).discounts
+        end
+      end
+    end
   end
   
   describe '#attrs' do
@@ -211,4 +240,4 @@ describe ShopProduct do
     end
   end
   
-end
+end

data/spec/models/shop_variant_spec.rb

@@ -3,21 +3,6 @@ require 'spec/spec_helper'
 describe ShopVariant do
   
   dataset :shop_variants, :shop_categories
-
-  describe 'relationships' do
-    before :each do
-      @variant = shop_variants(:bread_states)
-    end
-    context 'categories' do
-      before :each do
-        @breads = shop_categories(:bread)
-      end
-      it 'should have many' do
-        @variant.categories << @breads
-        @variant.categories.include?(@breads).should === true
-      end
-    end
-  end
   
   describe 'validations' do
     before :each do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 11
-  - 5
-  version: 0.11.5
+  - 6
+  version: 0.11.6
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +08:00
+date: 2010-10-14 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: radiant-layouts-extension
+  name: fastercsv
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: radiant-layouts-extension
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,11 +82,11 @@ dependencies:
         - 1
         version: 0.9.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: radiant-settings-extension
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,11 +98,11 @@ dependencies:
         - 1
         version: 1.1.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: radiant-images-extension
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,11 +114,11 @@ dependencies:
         - 2
         version: 0.3.2
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: radiant-forms-extension
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,27 +130,27 @@ dependencies:
         - 1
         version: 3.1.1
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: radiant-scoped-extension
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: radiant-drag-extension
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -146,7 +162,7 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 description: Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments
 email: dk@dirkkelly.com
 executables: []
@@ -167,6 +183,8 @@ files:
 - 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
@@ -179,11 +197,14 @@ files:
 - 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
@@ -239,6 +260,34 @@ files:
 - 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
@@ -279,6 +328,7 @@ files:
 - 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
@@ -313,8 +363,7 @@ files:
 - 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/_discounts.html.haml
-- app/views/admin/shop/products/index/buttons/_packages.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
@@ -332,6 +381,8 @@ files:
 - 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
@@ -358,6 +409,10 @@ files:
 - 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/seed.rb
 - db/seeds/forms.rb
 - db/seeds/layouts.rb
@@ -368,6 +423,7 @@ files:
 - 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
@@ -375,6 +431,7 @@ files:
 - lib/shop/models/form_extension.rb
 - lib/shop/models/image.rb
 - lib/shop/models/page.rb
+- lib/shop/models/user.rb
 - lib/shop/tags/address.rb
 - lib/shop/tags/card.rb
 - lib/shop/tags/cart.rb
@@ -386,15 +443,18 @@ files:
 - 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
@@ -404,6 +464,8 @@ files:
 - 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
@@ -417,6 +479,8 @@ files:
 - spec/datasets/shop_addresses.rb
 - spec/datasets/shop_categories.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
@@ -440,14 +504,18 @@ files:
 - 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
@@ -502,6 +570,8 @@ summary: Shop Extension for Radiant CMS
 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
@@ -515,6 +585,8 @@ test_files:
 - spec/datasets/shop_addresses.rb
 - spec/datasets/shop_categories.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
@@ -538,14 +610,18 @@ test_files:
 - 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

data/app/views/admin/shop/products/index/buttons/_discounts.html.haml

@@ -1 +0,0 @@
-=# link_to t("discounts"), admin_shop_packages_path, :class => 'button'

data/app/views/admin/shop/products/index/buttons/_packages.html.haml

@@ -1 +0,0 @@
-= link_to t("packages"), admin_shop_packages_path, :class => "button #{controller.controller_name == 'packages' ? 'active' : ''}"