radiant-shop-extension 0.10.0 → 0.11.0

data/db/migrate/20100929080301_shop_groups_change_add_description.rb

@@ -0,0 +1,11 @@
+class ShopGroupsChangeAddDescription < ActiveRecord::Migration
+  def self.up
+    add_column    :shop_groups, :description,   :text
+    add_column    :pages,       :shop_group_id, :integer
+  end
+
+  def self.down
+    remove_column :shop_groups, :description
+    remove_column :pages,       :shop_group_id
+  end
+end

data/db/migrate/20100929081200_create_variants.rb

@@ -0,0 +1,20 @@
+class CreateVariants < ActiveRecord::Migration
+  def self.up
+    create_table :shop_variants do |t|
+      t.string  :name
+      t.text    :options_json
+    end
+    
+    create_table :shop_product_variants do |t|
+      t.string  :name
+      t.decimal :price
+      
+      t.integer :product_id
+    end
+  end
+
+  def self.down
+    remove_table :shop_variants
+    remove_table :shop_product_variants
+  end
+end

data/db/migrate/20100929143531_change_variants_add_updated_by.rb

@@ -0,0 +1,25 @@
+class ChangeVariantsAddUpdatedBy < ActiveRecord::Migration
+  def self.up
+    add_column :shop_variants,  :created_by_id,   :integer
+    add_column :shop_variants,  :updated_by_id,   :integer
+    add_column :shop_variants,  :created_at,      :datetime
+    add_column :shop_variants,  :updated_at,      :datetime
+    
+    add_column :shop_groups,    :created_by_id,   :integer
+    add_column :shop_groups,    :updated_by_id,   :integer
+    add_column :shop_groups,    :created_at,      :datetime
+    add_column :shop_groups,    :updated_at,      :datetime
+  end
+  
+  def self.down
+    remove_column :shop_variants, :created_by_id
+    remove_column :shop_variants, :created_by_id
+    remove_column :shop_variants, :created_at
+    remove_column :shop_variants, :updated_at
+    
+    remove_column :shop_groups,   :created_by_id
+    remove_column :shop_groups,   :created_by_id
+    remove_column :shop_groups,   :created_at
+    remove_column :shop_groups,   :updated_at
+  end
+end

data/db/migrate/20100929145641_change_created_by_to_id.rb

@@ -0,0 +1,75 @@
+class ChangeCreatedByToId < ActiveRecord::Migration
+  def self.up
+    add_column :shop_products,    :created_by_id, :integer
+    add_column :shop_products,    :updated_by_id, :integer
+    remove_column :shop_products, :created_by
+    remove_column :shop_products, :updated_by
+    
+    add_column :shop_categories,    :created_by_id, :integer
+    add_column :shop_categories,    :updated_by_id, :integer
+    remove_column :shop_categories, :created_by
+    remove_column :shop_categories, :updated_by
+
+    add_column :shop_product_attachments,    :created_by_id, :integer
+    add_column :shop_product_attachments,    :updated_by_id, :integer
+    remove_column :shop_product_attachments, :created_by
+    remove_column :shop_product_attachments, :updated_by
+    
+    add_column :shop_addresses, :created_by_id, :integer
+    add_column :shop_addresses, :updated_by_id, :integer
+    add_column :shop_addresses, :created_at, :datetime
+    add_column :shop_addresses, :updated_at, :datetime
+    
+    add_column :shop_orders,    :created_by_id, :integer
+    add_column :shop_orders,    :updated_by_id, :integer
+    remove_column :shop_orders, :created_by
+    remove_column :shop_orders, :updated_by
+    
+    add_column :shop_line_items,    :created_by_id, :integer
+    add_column :shop_line_items,    :updated_by_id, :integer
+    remove_column :shop_line_items, :created_by
+    remove_column :shop_line_items, :updated_by
+    
+    add_column :shop_payments,    :created_by_id, :integer
+    add_column :shop_payments,    :updated_by_id, :integer
+    remove_column :shop_payments, :created_by
+    remove_column :shop_payments, :updated_by
+  end
+
+  def self.down
+    remove_column :shop_products, :created_by_id, :integer
+    remove_column :shop_products, :updated_by_id, :integer
+    add_column :shop_products,    :created_by,    :integer
+    add_column :shop_products,    :updated_by,    :integer
+        
+    remove_column :shop_categories, :created_by_id, :integer
+    remove_column :shop_categories, :updated_by_id, :integer
+    add_column :shop_categories,    :created_by,    :integer
+    add_column :shop_categories,    :updated_by,    :integer
+    
+    remove_column :shop_product_attachments,  :created_by_id, :integer
+    remove_column :shop_product_attachments,  :updated_by_id, :integer
+    add_column :shop_product_attachments,     :created_by,    :integer
+    add_column :shop_product_attachments,     :updated_by,    :integer    
+    
+    remove_column :shop_addresses, :created_by_id
+    remove_column :shop_addresses, :updated_by_id
+    remove_column :shop_addresses, :created_at
+    remove_column :shop_addresses, :updated_at
+    
+    remove_column :shop_orders, :created_by_id
+    remove_column :shop_orders, :updated_by_id
+    add_column :shop_orders,    :created_by,  :integer
+    add_column :shop_orders,    :updated_by,  :integer
+    
+    remove_column :shop_line_items, :created_by_id
+    remove_column :shop_line_items, :updated_by_id
+    add_column :shop_line_items,    :created_by,  :integer
+    add_column :shop_line_items,    :updated_by,  :integer
+    
+    remove_column :shop_payments, :created_by_id
+    remove_column :shop_payments, :updated_by_id
+    add_column :shop_payments,    :created_by,  :integer
+    add_column :shop_payments,    :updated_by,  :integer
+  end
+end

data/db/migrate/20100929235221_change_category_add_variant_id.rb

@@ -0,0 +1,9 @@
+class ChangeCategoryAddVariantId < ActiveRecord::Migration
+  def self.up
+    add_column :shop_categories, :variant_id, :integer
+  end
+
+  def self.down
+    remove_column :shop_categories, :variant_id
+  end
+end

data/db/migrate/20100930235221_create_packages.rb

@@ -0,0 +1,31 @@
+class CreatePackages < ActiveRecord::Migration
+  def self.up
+    create_table :shop_packages do |t|
+      t.string    :name
+      t.string    :sku
+      t.text      :description
+      t.boolean   :is_active, :default => true
+      
+      t.decimal   :price
+      
+      t.integer   :created_by
+      t.integer   :updated_by
+      
+      t.timestamps
+    end
+    
+    create_table :shop_packings do |t|
+      t.integer   :quantity,  :default => 1
+      t.integer   :position
+      
+      t.integer   :product_id
+      t.integer   :package_id      
+    end
+    
+  end
+
+  def self.down
+    drop_table :shop_packages
+    drop_table :shop_packings
+  end
+end

data/db/migrate/20101005231713_create_page_ids.rb

@@ -0,0 +1,11 @@
+class CreatePageIds < ActiveRecord::Migration
+  def self.up
+    add_column :shop_products, :page_id, :integer
+    add_column :shop_categories, :page_id, :integer
+  end
+
+  def self.down
+    remove_column :shop_products, :page_id, :integer
+    remove_column :shop_categories, :page_id, :integer
+  end
+end

data/db/migrate/20101006051214_create_pages_for_products_and_categories.rb

@@ -0,0 +1,73 @@
+class CreatePagesForProductsAndCategories < ActiveRecord::Migration
+  
+  class ShopProduct < ActiveRecord::Base
+    belongs_to :page
+    belongs_to :category, :class_name => 'ShopCategory', :foreign_key => :category_id
+    accepts_nested_attributes_for :page
+  end
+  
+  class ShopCategory < ActiveRecord::Base
+    belongs_to :page
+    
+    accepts_nested_attributes_for :page    
+  end
+  
+  def self.up    
+    ShopCategory.all.each do |c|
+      c.update_attributes(
+        :page => Page.create(
+          :title      => c.name,
+          :slug       => c.handle,
+          :breadcrumb => c.handle,
+          :status_id  => 100,
+          :parent_id  => Radiant::Config['shop.root_page_id'],
+          :layout_id  => c.layout_id,
+          :class_name => 'ShopCategoryPage',
+          :published_at => Time.now,
+          :parts      => [PagePart.create(
+            :name     => 'description',
+            :content  => c.description
+          )]
+        )
+      )
+    end
+    
+    ShopProduct.all.each do |p|
+      p.update_attributes(
+        :page => Page.create(
+          :title      => p.name,
+          :slug       => p.sku,
+          :breadcrumb => p.sku,
+          :status_id  => 100,
+          :parent_id  => ShopCategory.find(p.category_id).page_id,
+          :layout_id  => p.category.product_layout_id,
+          :class_name => 'ShopProductPage',
+          :published_at => Time.now,
+          :parts      => [PagePart.create(
+            :name     => 'description',
+            :content  => p.description
+          )]
+        )
+      )
+    end
+    
+    remove_column :shop_products,   :name
+    remove_column :shop_products,   :sku
+    remove_column :shop_products,   :description
+    remove_column :shop_products,   :is_active
+    remove_column :shop_products,   :position
+    remove_column :shop_products,   :category_id
+    remove_column :shop_products,   :layout_id
+    
+    remove_column :shop_categories, :name
+    remove_column :shop_categories, :handle
+    remove_column :shop_categories, :description
+    remove_column :shop_categories, :layout_id
+    remove_column :shop_categories, :position
+    remove_column :shop_categories, :is_active
+  end
+
+  def self.down
+    # There is no going back from this adventure
+  end
+end

data/db/migrate/20101007111845_add_default_position_to_attachment.rb

@@ -0,0 +1,9 @@
+class AddDefaultPositionToAttachment < ActiveRecord::Migration
+  def self.up
+    change_column :shop_product_attachments, :position, :integer, :default => 1, :allow_null => false
+  end
+
+  def self.down
+    change_column :shop_product_attachments, :position, :integer
+  end
+end

data/lib/shop/controllers/application_controller.rb

@@ -25,7 +25,7 @@ module Shop
             if find_shop_order and find_shop_order.status != 'paid'
               shop_order = find_shop_order
             else
-              shop_order = ShopOrder.create
+              shop_order = ShopOrder.create({ :customer_id => (current_user.id rescue nil) })
               request.session[:shop_order] = shop_order.id
             end
             

data/lib/shop/interface/categories.rb

@@ -0,0 +1,29 @@
+module Shop
+  module Interface
+    module Categories
+      
+      def self.included(base)
+        base.send :include, InstanceMethods
+      end
+      
+      module InstanceMethods
+        attr_accessor :categories
+        
+        protected
+                  
+        def load_default_shop_categories_regions
+          returning OpenStruct.new do |categories|
+            categories.edit = Radiant::AdminUI::RegionSet.new do |edit|
+              edit.main.concat %w{head form popups}
+              edit.form.concat %w{inputs meta parts foot}
+              edit.foot.concat %w{buttons timestamp}
+            end
+            categories.new = categories.edit
+            categories.remove = categories.index
+          end          
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop/interface/customers.rb

@@ -10,23 +10,23 @@ module Shop
         attr_accessor :customers
         
         protected
-          def load_default_shop_customers_regions
-            returning OpenStruct.new do |customers|
-              customers.edit = Radiant::AdminUI::RegionSet.new do |edit|
-                edit.main.concat %w{header form popups}
-                edit.form.concat %w{name email meta parts}
-                edit.bottom.concat %w{buttons timestamp}
-              end
-              customers.new = customers.edit
-              customers.index = Radiant::AdminUI::RegionSet.new do |index|
-                index.top
-                index.bottom.concat %w{ add }
-                index.thead.concat %w{ name modify }
-                index.customer.concat %w{ name modify }
-              end
-              customers.remove = customers.index
+
+        def load_default_shop_customers_regions
+          returning OpenStruct.new do |customers|
+            customers.edit = Radiant::AdminUI::RegionSet.new do |edit|
+              edit.main.concat %w{head form popups}
+              edit.form.concat %w{inputs meta parts foot}
+              edit.foot.concat %w{buttons timestamp}
             end
+            customers.new = customers.edit
+            customers.index = Radiant::AdminUI::RegionSet.new do |index|
+              index.head.concat %w{buttons}
+              index.body.concat %w{name modify}
+              index.foot.concat %w{add}
+            end
+            customers.remove = customers.index
           end
+        end
       end
       
     end

data/lib/shop/interface/orders.rb

@@ -0,0 +1,34 @@
+module Shop
+  module Interface
+    module Orders
+      
+      def self.included(base)
+        base.send :include, InstanceMethods
+      end
+      
+      module InstanceMethods
+        attr_accessor :orders
+        
+        protected
+
+        def load_default_shop_orders_regions
+          returning OpenStruct.new do |orders|
+            orders.edit = Radiant::AdminUI::RegionSet.new do |edit|
+              edit.main.concat %w{head form popups}
+              edit.form.concat %w{inputs meta parts foot}
+              edit.foot.concat %w{buttons timestamp}
+            end
+            orders.new = orders.edit
+            orders.index = Radiant::AdminUI::RegionSet.new do |index|
+              index.head.concat %w{buttons}
+              index.body.concat %w{price status updated customer}
+              index.foot.concat %w{}
+            end
+            orders.remove = orders.index
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop/interface/packages.rb

@@ -0,0 +1,34 @@
+module Shop
+  module Interface
+    module Packages
+      
+      def self.included(base)
+        base.send :include, InstanceMethods
+      end
+      
+      module InstanceMethods
+        attr_accessor :packages
+        
+        protected
+
+        def load_default_shop_packages_regions
+          returning OpenStruct.new do |packages|
+            packages.edit = Radiant::AdminUI::RegionSet.new do |edit|
+              edit.main.concat %w{head form popups}
+              edit.form.concat %w{inputs meta parts foot}
+              edit.foot.concat %w{buttons timestamp}
+            end
+            packages.new = packages.edit
+            packages.index = Radiant::AdminUI::RegionSet.new do |index|
+              index.head.concat %w{buttons}
+              index.body.concat %w{name modify}
+              index.foot.concat %w{add}
+            end
+            packages.remove = packages.index
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop/interface/products.rb

@@ -7,41 +7,28 @@ module Shop
       end
       
       module InstanceMethods
-        attr_accessor :products, :categories
+        attr_accessor :products
         
         protected
-          def load_default_shop_products_regions
-            returning OpenStruct.new do |products|
-              products.edit = Radiant::AdminUI::RegionSet.new do |edit|
-                edit.main.concat %w{edit_header edit_form edit_popups}
-                edit.sidebar
-                edit.form.concat %w{edit_name edit_price edit_extended_metadata edit_content}
-                edit.form_bottom.concat %w{edit_buttons edit_timestamp}
-              end
-              products.new = products.edit
-              products.index = Radiant::AdminUI::RegionSet.new do |index|
-                index.top
-                index.bottom.concat %w{ add_category }
-                index.thead.concat %w{ name_header description_header modify_header }
-                index.category_attributes.concat %w{ category_name category_description category_modify }
-                index.category_products.concat %w{ category_products }
-                index.product.concat %w{ product_name product_modify }
-              end
-              products.remove = products.index
+
+        def load_default_shop_products_regions
+          returning OpenStruct.new do |products|
+            products.edit = Radiant::AdminUI::RegionSet.new do |edit|
+              edit.main.concat %w{head form popups}
+              edit.form.concat %w{inputs meta parts foot}
+              edit.foot.concat %w{buttons timestamp}
             end
+            products.new = products.edit
+            products.index = Radiant::AdminUI::RegionSet.new do |index|
+              index.head.concat     %w{buttons}
+              index.category.concat %w{move name handle modify}
+              index.products.concat %w{body}
+              index.product.concat  %w{move icon name sku modify}
+              index.foot.concat     %w{add}
+            end
+            products.remove = products.index
           end
-          
-          def load_default_shop_categories_regions
-            returning OpenStruct.new do |categories|
-              categories.edit = Radiant::AdminUI::RegionSet.new do |edit|
-                edit.main.concat %w{edit_header edit_form edit_popups}
-                edit.form.concat %w{edit_name edit_extended_metadata edit_content}
-                edit.form_bottom.concat %w{edit_buttons edit_timestamp}
-              end
-              categories.new = categories.edit
-              categories.remove = categories.index
-            end          
-          end
+        end
       end
       
     end