radiant-shop-extension 0.11.5 → 0.11.6

data/public/stylesheets/sass/admin/extensions/shop/index.sass

@@ -8,45 +8,6 @@
       height: 46px
       padding-right: 20px
       background-color: #7E7E7E
-  
-    .button
-      float: right
-      margin-left: 10px
-      margin-top: 10px
-      display: block
-      height: 16px
-      padding: 6px 8px
-      font:
-        size: 12px
-        weight: bold
-      background:
-        color: #eeeeee
-        image: url(/images/admin/buttons_background.png)
-        position: 0 0
-        repeat: repeat-x
-      color: #555555
-      text:
-        decoration: none
-        shadow: 1px 1px 1px #eeeeee
-      cursor: pointer
-      border:
-        radius: 5px
-      -moz:
-        border:
-          radius: 5px
-      -webkit:
-        border:
-          radius: 5px
-        
-      img
-        position: relative
-        top: -2px
-      
-      &:hover, &.active
-        background: #ebebeb
-        color: #000000
-        text:
-          shadow: 1px 1px 1px #FFFFFF
           
   .map
     background-color: #FFFFFF
@@ -112,4 +73,17 @@
             background:
               image: url(/images/admin/minus.png)
               repeat: no-repeat
-              position: 0 50%
+              position: 0 50%
+  
+  #actions
+    
+    ul
+    
+      li
+        
+        a
+    
+          &.active
+            -moz-box-shadow: none
+            background: url("../../images/admin/shadow.png") repeat-x scroll 0 0 #FFFFFF
+            color: #000000

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.11.5"
+  s.version = "0.11.6"
 
   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-09}
+  s.date = %q{2010-10-14}
   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 = [
@@ -27,6 +27,8 @@ Gem::Specification.new do |s|
      "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",
@@ -39,11 +41,14 @@ Gem::Specification.new do |s|
      "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",
@@ -99,6 +104,34 @@ 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",
@@ -139,6 +172,7 @@ Gem::Specification.new do |s|
      "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",
@@ -173,8 +207,7 @@ Gem::Specification.new do |s|
      "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",
@@ -192,6 +225,8 @@ Gem::Specification.new do |s|
      "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",
@@ -218,6 +253,10 @@ Gem::Specification.new do |s|
      "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",
@@ -228,6 +267,7 @@ Gem::Specification.new do |s|
      "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",
@@ -235,6 +275,7 @@ Gem::Specification.new do |s|
      "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",
@@ -246,15 +287,18 @@ Gem::Specification.new do |s|
      "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",
@@ -264,6 +308,8 @@ Gem::Specification.new do |s|
      "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",
@@ -277,6 +323,8 @@ Gem::Specification.new do |s|
      "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",
@@ -300,14 +348,18 @@ Gem::Specification.new do |s|
      "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",
@@ -334,6 +386,8 @@ 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",
@@ -347,6 +401,8 @@ Gem::Specification.new do |s|
      "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",
@@ -370,14 +426,18 @@ Gem::Specification.new do |s|
      "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",
@@ -399,30 +459,33 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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.1"])
+      s.add_runtime_dependency(%q<radiant-scoped-extension>, [">= 0.2.2"])
       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.1"])
+      s.add_dependency(%q<radiant-scoped-extension>, [">= 0.2.2"])
       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.1"])
+    s.add_dependency(%q<radiant-scoped-extension>, [">= 0.2.2"])
     s.add_dependency(%q<radiant-drag-extension>, [">= 0.1.0"])
   end
 end

data/shop_extension.rb

@@ -5,35 +5,40 @@ class ShopExtension < Radiant::Extension
   
   extension_config do |config|
     config.gem 'activemerchant', :lib => 'active_merchant'
+    config.gem 'fastercsv',      :lib => 'fastercsv'
   end
   
-  UserActionObserver.instance.send :add_observer!, ShopProduct
   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
-  UserActionObserver.instance.send :add_observer!, ShopPackage
   
   def activate    
     # View Hooks
     unless defined? admin.products
-      Radiant::AdminUI.send :include, Shop::Interface::Categories, Shop::Interface::Customers, Shop::Interface::Orders, Shop::Interface::Packages, Shop::Interface::Products, Shop::Interface::Variants
-
-      admin.categories= Radiant::AdminUI.load_default_shop_categories_regions
-      admin.customers = Radiant::AdminUI.load_default_shop_customers_regions
-      admin.orders    = Radiant::AdminUI.load_default_shop_orders_regions
-      admin.packages  = Radiant::AdminUI.load_default_shop_packages_regions      
-      admin.products  = Radiant::AdminUI.load_default_shop_products_regions
-      admin.variants  = Radiant::AdminUI.load_default_shop_variants_regions
+      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
+      
+      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.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
+    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
     
     # Model Includes
-    Page.send :include, Shop::Models::Page
+    Page.send :include,  Shop::Models::Page
     Image.send :include, Shop::Models::Image
+    User.send :include,  Shop::Models::User
     
     # Controller Includes
     ApplicationController.send :include, Shop::Controllers::ApplicationController
@@ -43,7 +48,9 @@ class ShopExtension < Radiant::Extension
     
     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
     
@@ -58,6 +65,10 @@ 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_percentage']  ||= '10'
+    Radiant::Config['shop.tax_name']        ||= 'gst'
+    
     # Scoped Customer Welcome Page
     Radiant::Config['scoped.customer.redirect'] = '/cart'
   end

data/spec/controllers/admin/shop/discounts/discountables_controller_spec.rb

@@ -0,0 +1,73 @@
+require 'spec/spec_helper'
+
+describe Admin::Shop::Discounts::DiscountablesController do
+  
+  dataset :users, :shop_discountables
+  
+  before :each do
+    login_as :admin
+    @discountable = shop_discountables(:ten_percent_bread)
+  end
+  
+  describe '#create' do
+    before :each do
+      @discounted = shop_products(:warm_bread)
+    end
+    context 'packing could not be created' do
+      before :each do
+        stub(ShopDiscountable).new { @discountable }
+        mock(@discountable).save! { raise ActiveRecord::RecordNotSaved }
+      end
+      
+      context 'js' do
+        it 'should return error notice and failure status' do
+          post :create, :discount_id => @discountable.discount.id, :discounted_id => @discounted.id, :discounted_type => @discounted.class.name, :format => 'js'
+          
+          response.body.should === 'Could not attach Discount.'
+          response.should_not be_success
+        end
+      end
+    end
+
+    context 'packing successfully created' do
+      context 'js' do
+        it 'should render the collection partial and success status' do
+          post :create, :discount_id => @discountable.discount.id, :discounted_id => @discounted.id, :discounted_type => @discounted.class.name, :format => 'js'
+
+          response.should be_success
+          assigns(:shop_discountable).is_a?(ShopDiscountable).should === true
+          response.should render_template('admin/shop/discounts/edit/shared/_product')
+        end
+      end
+    end
+  end
+  
+  describe '#destroy' do    
+    context 'discountable not destroyed' do
+      before :each do
+        stub(ShopDiscountable).find(@discountable.id.to_s) { @discountable }
+        stub(@discountable).destroy { raise ActiveRecord::RecordNotFound }
+      end
+      
+      context 'js' do
+        it 'should render an error and failure status' do
+          delete :destroy, :discount_id => @discountable.discount.id, :id => @discountable.id, :format => 'js'
+          
+          response.should_not be_success
+          response.body.should === 'Could not remove Discount.'
+        end
+      end
+    end
+    
+    context 'discountable successfully destroyed' do
+      context 'js' do
+        it 'should render success message and success status' do
+          delete :destroy, :discount_id => @discountable.discount.id, :id => @discountable.id, :format => 'js'
+          response.should be_success
+          response.should render_template('admin/shop/discounts/edit/shared/_category')
+        end
+      end
+    end
+  end
+  
+end