radiant-shop-extension 0.10.0 → 0.11.0

data/README.md

@@ -29,4 +29,8 @@ pppps: love heart
       config.gem 'ruby-debug',        :version => '0.10.3'
       config.gem 'webrat',            :version => '0.7.1'
       config.gem 'rr',                :version => '0.10.11'
-    end        
+    end        
+    
+# Migrating in Development
+
+    rm db/development.sqlite3.db; rake db:migrate; rake radiant:extensions:scoped:migrate; rake radiant:extensions:settings:migrate; rake radiant:extensions:drag:migrate; rake radiant:extensions:forms:migrate; rake radiant:extensions:images:migrate; rake radiant:extensions:shop:migrate; rake radiant:extensions:shop_mg:migrate; rake radiant:extensions:export:load;

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0

data/app/controllers/admin/shop/categories_controller.rb

@@ -7,34 +7,17 @@ class Admin::Shop::CategoriesController < Admin::ResourceController
   before_filter :config_edit,   :only => [ :edit, :update ]
   before_filter :assets_global
   
-  before_filter :set_layouts,   :only => [ :new ]
+  before_filter :set_layouts_and_page,   :only => [ :new ]
   
   # GET /admin/shop/products/categories
   # GET /admin/shop/products/categories.js
   # GET /admin/shop/products/categories.json                      AJAX and HTML
   #----------------------------------------------------------------------------
   def index
-    @shop_categories = ShopCategory.search(params[:search])
-    
     respond_to do |format|
       format.html { redirect_to admin_shop_products_path }
-      format.js   { render :partial => '/admin/shop/categories/index/category', :collection => @shop_categories }
-      format.json { render :json    => @shop_categories.to_json(ShopCategory.params) }
-    end
-  end
-  
-  # GET /admin/shop/products/categories/1/products
-  # GET /admin/shop/products/categories/1/products.js
-  # GET /admin/shop/products/categories/1/products.json           AJAX and HTML
-  #----------------------------------------------------------------------------
-  def products
-    @shop_category = ShopCategory.find(params[:id])
-    @shop_products = @shop_category.products
-    
-    respond_to do |format|
-      format.html { render :template  => '/admin/shop/products/index' }
-      format.js   { render :partial   => '/admin/shop/products/index/product', :collection => @shop_products }
-      format.json { render :json      => @shop_products.to_json(ShopProduct.params) }
+      format.js   { render      :partial => '/admin/shop/categories/index/category', :collection => @shop_categories }
+      format.json { render      :json    => @shop_categories.to_json }
     end
   end
   
@@ -47,15 +30,10 @@ class Admin::Shop::CategoriesController < Admin::ResourceController
     error   = 'Could not sort Categories.'
     
     begin  
-      @shop_categories = CGI::parse(params[:categories])["shop_categories[]"]
-
-      @shop_categories.each_with_index do |id, index|
-        ShopCategory.find(id).update_attributes!({:position => index+1})
-      end
+      ShopCategory.sort(CGI::parse(params[:categories])["categories[]"])
       
       respond_to do |format|
         format.html {
-          flash[:notice] = notice
           redirect_to admin_shop_products_path
         }
         format.js   { render  :text => notice, :status => :ok }
@@ -87,14 +65,12 @@ class Admin::Shop::CategoriesController < Admin::ResourceController
       @shop_category.save!
       
       respond_to do |format|
-        format.html { 
-          flash[:notice] = notice
-          
-          redirect_to edit_admin_shop_category_path(@shop_category) if params[:continue]
+        format.html {
+          redirect_to [:edit_admin, @shop_category] if params[:continue]
           redirect_to admin_shop_categories_path unless params[:continue]
         }
         format.js   { render :partial => '/admin/shop/categories/index/category', :locals => { :product => @shop_category } }
-        format.json { render :json    => @shop_category.to_json(ShopCategory.params) }
+        format.json { render :json    => @shop_category.to_json }
       end
     rescue
       respond_to do |format|
@@ -120,13 +96,12 @@ class Admin::Shop::CategoriesController < Admin::ResourceController
       @shop_category.update_attributes!(params[:shop_category])
       
       respond_to do |format|
-        format.html { 
-          flash[:notice] = notice
+        format.html {
           redirect_to edit_admin_shop_category_path(@shop_category) if params[:continue]
           redirect_to admin_shop_categories_path unless params[:continue]
         }
         format.js   { render :partial => '/admin/shop/categories/index/category', :locals => { :product => @shop_category } }
-        format.json { render :json    => @shop_category.to_json(ShopCategory.params) }
+        format.json { render :json    => @shop_category.to_json }
       end
     rescue
       respond_to do |format|
@@ -146,60 +121,52 @@ class Admin::Shop::CategoriesController < Admin::ResourceController
   #----------------------------------------------------------------------------
   def destroy
     notice = 'Category deleted successfully.'
-    error = 'Could not delete Category.'
     
-    begin
-      @shop_category.destroy
-      
-      respond_to do |format|
-        format.html {
-          flash[:notice] = notice
-          redirect_to admin_shop_categories_path
-        }
-        format.js   { render :text  => notice, :status => :ok }
-        format.json { render :json  => { :notice => notice }, :status => :ok }
-      end
-    rescue
-      respond_to do |format|
-        format.html {
-          flash[:error] = error
-          render :remove
-        }
-        format.js   { render :text  => error, :status => :unprocessable_entity }
-        format.json { render :json  => { :error => error }, :status => :unprocessable_entity }
-      end
+    @shop_category.destroy
+    
+    respond_to do |format|
+      format.html {
+        redirect_to admin_shop_categories_path
+      }
+      format.js   { render :text  => notice, :status => :ok }
+      format.json { render :json  => { :notice => notice }, :status => :ok }
     end
   end
   
 private
   
   def config_global
+    @inputs   ||= []
     @meta     ||= []
     @buttons  ||= []
     @parts    ||= []
     @popups   ||= []
+    
+    @inputs   << 'name'
+    
+    @meta     << 'handle'
+    @meta     << 'layouts'
+    @meta     << 'page'
+    
+    @parts    << 'description'
   end
   
   def config_new
-    @meta  << 'layouts'
-    @meta  << 'handle'
-    
-    @parts << 'description'
   end
   
   def config_edit
-    @meta  << 'layouts'
-    @meta  << 'handle'
-    
-    @parts << 'description'
   end
   
   def assets_global
     include_stylesheet 'admin/extensions/shop/edit'
   end
   
-  def set_layouts
-    @shop_category.layout = Layout.find_by_name(Radiant::Config['shop.category_layout'])
+  def set_layouts_and_page
+    @shop_category.page = Page.new(
+      :layout_id  => Layout.find_by_name(Radiant::Config['shop.layout_category']).id,
+      :parent_id  => Radiant::Config['shop.root_page_id'],
+      :parts      => [PagePart.new]
+    )
     @shop_category.product_layout = Layout.find_by_name(Radiant::Config['shop.product_layout'])
   end
   

data/app/controllers/admin/shop/customers_controller.rb

@@ -11,23 +11,24 @@ class Admin::Shop::CustomersController < Admin::ResourceController
   private
     
     def config_global
+      @inputs   ||= []
       @meta     ||= []
       @buttons  ||= []
       @parts    ||= []
       @popups   ||= []
+      
+      @inputs   << 'name'
+      @inputs   << 'email'
+      
+      @meta     << 'login'
+      @meta     << 'password'
+      @meta     << 'password_confirmation'
     end
     
     def config_new
-      @meta  << 'login'
-      @meta  << 'password'
-      @meta  << 'password_confirmation'
     end
     
     def config_edit
-      @meta  << 'login'
-      @meta  << 'password'
-      @meta  << 'password_confirmation'
-      
       @parts << 'orders'
       @parts << 'addresses'
     end

data/app/controllers/admin/shop/orders_controller.rb

@@ -1,171 +1,49 @@
 class Admin::Shop::OrdersController < Admin::ResourceController
   model_class ShopOrder
+
+  before_filter :config_global
+  before_filter :config_index,  :only => [ :index ]
+  before_filter :config_new,    :only => [ :new, :create ]
+  before_filter :config_edit,   :only => [ :edit, :update ]
+  before_filter :assets_global
+  before_filter :assets_index,  :only => [ :index ]
+  before_filter :assets_edit,   :only => [ :edit, :update ]
   
-  # GET /admin/shop/orders
-  # GET /admin/shop/orders.js
-  # GET /admin/shop/orders.xml
-  # GET /admin/shop/orders.json                                   AJAX and HTML
-  #----------------------------------------------------------------------------
-  def index
-    @shop_orders = ShopOrder.search(params[:search], params[:filter], params[:page])
-    @shop_order = ShopOrder.new
-    @shop_order.line_items.build
-    attr_hash = {
-      :methods => [:sub_total, :balance],
-      :include => {
-        :customer => {
-          :include => {
-            :addresses => {:only => [ :street, :city, :state, :zip, :country, :unit, :atype ]}
-          },
-          :only => [:id, :name, :email, :organization]
-        },
-        :line_items => {
-          :methods => [:total],
-          :include => {
-            :product => {:only => [:id, :sku, :description, :handle, :price, :title]},
-          },
-          :only => [:id, :quantity]
-        }
-      },
-      :only => [:id, :status, :created_at, :updated_at]
-    }
+  private
+  
+    def config_global
+      @inputs   ||= []
+      @meta     ||= []
+      @buttons  ||= []
+      @parts    ||= []
+      @popups   ||= []
+    end
     
-    respond_to do |format|
-      format.html { render }
-      format.js { render :partial => '/admin/shop/orders/excerpt', :collection => @shop_orders }
-      format.xml { render :xml => @shop_orders.to_xml(attr_hash) }
-      format.json { render :json => @shop_orders.to_json(attr_hash) }
+    def config_index
+      @buttons  << 'shipped'
+      @buttons  << 'paid'
+      @buttons  << 'new'
+      @buttons  << 'all'
     end
-  end
-  
-  # GET /admin/shop/orders/1
-  # GET /admin/shop/orders/1.js
-  # GET /admin/shop/orders/1.xml
-  # GET /admin/shop/orders/1.json                                 AJAX and HTML
-  #----------------------------------------------------------------------------
-  def show
-    @shop_order = ShopOrder.find(params[:id])
-    attr_hash = {
-      :methods => [:sub_total, :balance],
-      :include => {
-        :customer => {
-          :include => {
-            :addresses => {:only => [ :street, :city, :state, :zip, :country, :unit, :atype ]}
-          },
-          :only => [:id, :name, :email, :organization]
-        },
-        :line_items => {
-          :methods => [:total],
-          :include => {
-            :product => {:only => [:id, :sku, :description, :handle, :price, :title]},
-          },
-          :only => [:id, :quantity]
-        }
-      },
-      :only => [:id, :status, :created_at, :updated_at]
-    }
-    respond_to do |format|
-      format.html { render }
-      format.js { render :partial => '/admin/shop/orders/order', :locals => { :order => @shop_order } }
-      format.xml { render :xml => @shop_order.to_xml(attr_hash) }
-      format.json { render :json => @shop_order.to_json(attr_hash) }
+    
+    def config_new
     end
-  end
-  
-  # POST /admin/shop/orders
-  # POST /admin/shop/orders.js
-  # POST /admin/shop/orders.xml
-  # POST /admin/shop/orders.json                                  AJAX and HTML
-  #----------------------------------------------------------------------------
-  def create                                     
-    @shop_order = ShopOrder.new(params[:shop_order])
     
-    if @shop_order.save!
-      respond_to do |format|
-        format.html { 
-          flash[:notice] = "Order created successfully."
-          redirect_to admin_shop_orders_path 
-        }
-        format.js { render :partial => '/admin/shop/orders/excerpt', :locals => { :excerpt => @shop_order } }
-        format.xml { redirect_to "/admin/shop/orders/#{@shop_order.id}.xml" }
-        format.json { redirect_to "/admin/shop/orders/#{@shop_order.id}.json" }
-      end
-    else
-      respond_to do |format|
-        format.html { 
-          flash[:error] = "Unable to create new customer."
-          render
-        }
-        format.js { render :text => @shop_order.errors.to_json, :status => :unprocessable_entity }
-        format.xml { render :xml => @shop_order.errors.to_xml, :status => :unprocessable_entity }
-        format.json { render :json => @shop_order.errors.to_json, :status => :unprocessable_entity }
-      end
+    def config_edit
+      @parts    << 'items'
+      @parts    << 'addresses' if @shop_order.billing.present?
+      @parts    << 'customer'  if @shop_order.customer.present?
     end
-  end
-  
-  # PUT /shop/orders/1
-  # PUT /shop/orders/1.xml
-  # PUT /shop/orders/1.json                                        AJAX and HTML
-  #-----------------------------------------------------------------------------
-  def update
-    @shop_order = ShopOrder.find(params[:id])
-    if @shop_order.update_attributes!(params[:shop_order])
-      respond_to do |format|
-        format.html { 
-          flash[:notice] = "Order updated successfully."
-          redirect_to admin_shop_customers_path 
-        }
-        format.js { render :partial => '/admin/shop/orders/excerpt', :locals => { :excerpt => @shop_order } }
-        format.xml { redirect_to "/admin/shop/orders/#{@shop_order.id}.xml" }
-        format.json { redirect_to "/admin/shop/orders/#{@shop_order.id}.json" }
-      end
-    else
-      respond_to do |format|
-        format.html { 
-          flash[:error] = "Unable to update order."
-          render
-        }
-        format.js { render :text => @shop_order.errors.to_s, :status => :unprocessable_entity }
-        format.xml { render :xml => @shop_order.errors.to_xml, :status => :unprocessable_entity }
-        format.json { render :json => @shop_order.errors.to_json, :status => :unprocessable_entity }
-      end
+    
+    def assets_global
+      include_stylesheet 'admin/extensions/shop/edit'
+      include_stylesheet 'admin/extensions/shop/index'
     end
-  end
-  
-  # DELETE /admin/shop/orders/1
-  # DELETE /admin/shop/orders/1.js
-  # DELETE /admin/shop/orders/1.xml
-  # DELETE /admin/shop/orders/1.json                              AJAX and HTML
-  #----------------------------------------------------------------------------
-  def destroy
-    # Need to rewrite this method to check for errors and return xml or json.
-    # For some reason the answer isn't obvious to me.
-    @shop_order = ShopOrder.find(params[:id])
     
-    if @shop_order
-      @message = "Order deleted successfully."
-      @shop_order.destroy
-      
-      respond_to do |format|
-        format.html {
-          flash[:notice] = @message
-          redirect_to admin_shop_orders_path
-        }
-        format.js { render :text => @message, :status => 200 }
-        format.xml  { render :xml => {:message => @message}, :status => 200 }
-        format.json  { render :json => {:message => @message}, :status => 200 }
-      end
-    else
-      @message = "Unable to delete order."
-      respond_to do |format|
-        format.html {
-          flash[:error] = @message
-        }
-        format.js { render :text => @message, :status => :unprocessable_entity }
-        format.xml  { render :xml => {:message => @message}, :status => :unprocessable_entity }
-        format.json  { render :json => {:message => @message}, :status => :unprocessable_entity }
-      end
+    def assets_index
     end
-  end
-  
+    
+    def assets_edit
+    end
+    
 end

data/app/controllers/admin/shop/packages/packings_controller.rb

@@ -0,0 +1,90 @@
+class Admin::Shop::Packages::PackingsController < Admin::ResourceController
+  model_class ShopPacking
+  
+  def sort
+    notice = 'Products successfully sorted.'
+    error  = 'Could not sort products.'
+    
+    begin  
+      @shop_packings = CGI::parse(params[:packings])["package_products[]"]
+
+      @shop_packings.each_with_index do |id, index|
+        ShopPacking.find(id).update_attributes!({ :position, index+1 })
+      end
+      
+      respond_to do |format|
+        format.html {
+          redirect_to admin_shop_packages_path
+        }
+        format.js   { render  :text => notice, :status => :ok }
+        format.json { render  :json => { :notice => notice }, :status => :ok }
+      end
+    rescue
+      respond_to do |format|
+        format.html {
+          flash[:error] = error
+          redirect_to admin_shop_packages_path
+        }
+        format.js   { render  :text => error, :status => :unprocessable_entity }
+        format.json { render  :json => { :error => error }, :status => :unprocessable_entity }
+      end
+    end
+  end
+  
+  def create
+    notice = 'Product successfully attached.'
+    error  = 'Could not attach product.'
+    
+    begin
+      @shop_packing.package = ShopPackage.find(params[:package_id])
+      @shop_packing.product = ShopProduct.find(params[:product_id])
+      @shop_packing.save!
+      
+      respond_to do |format|
+        format.js { render :partial => 'admin/shop/packages/edit/shared/product', :locals => { :product => @shop_packing.product, :packing => @shop_packing } }
+      end
+    rescue
+      respond_to do |format|
+        format.js   { render :text  => error, :status => :unprocessable_entity }
+      end
+    end
+  end
+  
+  def update
+    notice = 'Product Quantity successfully updated.'
+    error  = 'Could not update Product Quantity.'
+    
+    begin
+      @shop_packing.update_attributes!({ :quantity => params[:quantity] })
+      respond_to do |format|
+        format.js   { render :text  => notice, :status => :ok }
+      end
+    rescue
+      respond_to do |format|
+        format.js   { render :text  => error, :status => :unprocessable_entity }
+      end
+    end
+    
+  end
+  
+  def destroy
+    notice = 'Product successfully removed.'
+    error  = 'Could not remove product.'
+    
+    begin
+      @shop_product = @shop_packing.product
+      @shop_package = @shop_packing.package
+      
+      @shop_packing.destroy
+      
+      respond_to do |format|
+        format.js { render :partial => 'admin/shop/packages/edit/shared/product', :locals => { :product => @shop_product } }
+      end
+    rescue
+      respond_to do |format|
+        format.js   { render :text  => error, :status => :unprocessable_entity }
+      end
+    end
+  end
+  
+end