refinerycms-stores 0.0.16 → 0.1.0

data/Gemfile

@@ -24,4 +24,6 @@ gem 'hpricot'
 gem 'ruby_parser'
 gem 'haml-rails'
 gem 'stripe', :git => 'https://github.com/stripe/stripe-ruby'
+gem 'paperclip', :git => "git://github.com/thoughtbot/paperclip.git"
+gem 'aws-sdk'
 

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.1.0

data/app/assets/stylesheets/refinery/refinerycms-stores.sass

@@ -81,10 +81,76 @@ table.product-header
   font-size: small
 
   .customer-actions
+    p
+      color: gray
+      padding-bottom: 1em
+      font-style: italic
     a
       font-color: blue
+      font-style: normal
 
     a:hover
       background: #c3c3c3
       text-decoration: underline
 
+.download-documents
+  dl
+    float: left
+    text-align: center
+    font-size: small
+  dt, dd
+    width: 110px
+    float: left
+  dt
+    margin-bottom: 4em
+    // vertical space between the images
+  dd
+    text-align: center
+    margin: 65px 0 0 -110px
+  img.icon_image
+    height: 62px
+    width: 67px
+    vertical-align: bottom
+    margin-left: 20px
+    border: 0
+
+#orders
+  th.date-col, td.date-col
+
+  th.order-no-col, td.order-no-col
+    text-align: left
+
+  th.item-col, td.item-col
+    text-align: left
+
+  th.amount-col, td.amount-col
+    text-align: right
+
+  th.status-col, td.status-col
+    text-align: center
+
+.address-block
+  font-size: smaller
+  width: 40%
+  float: left
+  border: solid 1px #c3c3c3
+  padding: 1em
+
+  h3
+    color: #6a6a6a
+
+.order-content
+  padding: 1em
+  float: none
+  clear: both
+
+  td.sub-total-type
+    text-align: right
+
+  td.item-unit-price
+    text-align: right
+
+  td.right-just
+    text-align: right
+
+

data/app/controllers/refinery/customers/customers_controller.rb

@@ -1,10 +1,13 @@
 module Refinery
   module Customers
-    class CustomersController < ApplicationController
+    class CustomersController < ::ApplicationController
 
-      crudify :customer
+      # crudify ::Refinery::Customers::Customer
 
       before_filter :authenticate_refinery_user!, :get_customer, :except => [:new, :create] 
+  
+      layout 'refinery/layouts/login', :only => :new
+
 
       def new
         @customer = Customer.new
@@ -12,22 +15,40 @@ module Refinery
 
       # GET /customers/:id/edit
       def edit
+        @billing_address = 
+          ( @customer.billing_address.nil?  ?  
+            ::Refinery::Addresses::Address.new( :email => @customer.email ) : 
+            @customer.billing_address 
+          )
+        @shipping_address = 
+          ( @customer.shipping_address.nil?  ?  
+            ::Refinery::Addresses::Address.new( :email => @customer.email ) : 
+            @customer.shipping_address 
+          )
       end
 
       # PUT /customers/:id
       def update
 
-        if params[:customer][:password].blank? and params[:customer][:password_confirmation].blank?
-          params[:customer].delete(:password)
-          params[:customer].delete(:password_confirmation)
+        @billing_address, @shipping_address = 
+            ::Refinery::Addresses::Address.update_addresses( @customer,  params )
+
+        fields = ( params[:user].nil?  ?  :customers_customer  :  :user )
+
+        if params[fields][:password].blank? and params[fields][:password_confirmation].blank?
+          params[fields].delete(:password)
+          params[fields].delete(:password_confirmation)
         end
 
         # keep these the same
-        params[:customer][:username] = params[:customer][:email]
+        params[fields][:username] = @customer.email
+
+        if @customer.update_attributes(params[fields]) && 
+              @billing_address.errors.empty? &&  
+              @shipping_address.errors.empty?
 
-        if @customer.update_attributes(params[:customer])
           flash[:notice] = t('successful', :scope => 'customers.update', :email => @customer.email)
-          redirect_to root_path 
+          redirect_to refinery.stores_root_path 
 
         else
           render :action => 'edit'
@@ -36,13 +57,13 @@ module Refinery
       end
 
       def create
-        @customer = Customer.new(params[:customer])
+        @customer = Customer.new(params[:customers_customer])
         @customer.username = @customer.email
 
         if @customer.save
           @customer.roles << ::Refinery::Role[:customer]  # remember as a customer role
-          
-          redirect_to root_path 
+          sign_in( @customer)   # forces devise to login this user
+          redirect_to refinery.stores_root_path 
 
         else
           @customer.errors.delete(:username) # this is set to email
@@ -55,7 +76,7 @@ module Refinery
     protected
 
       def redirect?
-        if refinery_current_user.nil?
+        if current_refinery_user.nil?
           redirect_to new_refinery_user_session_path
         end
       end
@@ -64,11 +85,8 @@ module Refinery
       # get_customer -- returns @customer else error if cur_user mismatch
       # ----------------------------------------------------------------------
       def get_customer()
-        if params[:id] != refinery_current_user.id 
-          error_404
-        else
-          @customer = Customer.find(params[:id])
-        end
+        @customer = current_refinery_user
+        error_404 unless params[:id] == @customer.to_param
       end
 
     end  #  class

data/app/controllers/refinery/orders/admin/orders_controller.rb

@@ -4,7 +4,8 @@ module Refinery
       class OrdersController < ::Refinery::AdminController
 
         crudify :'refinery/orders/order',
-                :title_attribute => 'order_status', :xhr_paging => true
+                :title_attribute => 'order_status', 
+                :xhr_paging => true
 
       end
     end

data/app/controllers/refinery/orders/orders_controller.rb

@@ -7,9 +7,12 @@ module Refinery
       # ensure state machine transitions
 
       before_filter :authenticate_refinery_user!
+
       before_filter :find_all_orders, :only => :index
       before_filter :find_order, :except => :index
-      before_filter :setup_payment_gateway, :only => [:edit, :update, :purchase, :re_edit]
+      before_filter :setup_payment_gateway, :only => [:show, :edit, :update, :purchase, :re_edit]
+
+      helper  'refinery/stores/stores'
 
       def index
         # you can use meta fields from your model instead (e.g. browser_title)
@@ -18,9 +21,12 @@ module Refinery
       end
 
       def show
-        # you can use meta fields from your model instead (e.g. browser_title)
-        # by swapping @page for @order in the line below:
-        present(@order)
+        if (@action = @order.get_render_template).nil?
+          present(@order)
+        else
+          prep_edit_view
+          render :action => @action
+        end  # if..then..else no action
       end
 
         # update must proceed within confines of order state machine
@@ -70,12 +76,13 @@ module Refinery
     protected
 
       def find_all_orders
-        @orders = Order.order('position ASC')
+        @orders = current_refinery_user.orders
       end
 
       def find_order
         @order = Order.find(params[:id]) 
-      end
+        return false unless refinery_user_signed_in? && current_refinery_user == @order.user
+       end
 
       def find_page
         @page = ::Refinery::Page.where(:link_url => "/orders").first
@@ -86,9 +93,7 @@ module Refinery
       end
 
       def prep_edit_view
-        if @billing_address.nil?
-          @billing_address, @shipping_address = @order.get_billship_addresses
-        end
+        @billing_address, @shipping_address = @order.get_billship_addresses( current_refinery_user )
       end
 
     end   #  class OrdersController

data/app/controllers/refinery/products/admin/digidownloads_controller.rb

@@ -0,0 +1,39 @@
+# #########################################################################
+#
+# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+#
+# #########################################################################
+module Refinery
+  module Products
+    module Admin
+      class DigidownloadsController < ::Refinery::AdminController
+
+# #########################################################################
+         crudify :'refinery/products/digidownload',
+                :title_attribute => 'doc_file_name', :xhr_paging => true
+
+
+# #########################################################################
+
+# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+
+# #########################################################################
+  private
+# #########################################################################
+
+
+# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+#
+# #########################################################################
+
+
+      end   # class DigidownloadsController
+    end  # mod admin
+  end  # mod products
+end   # mod refinery

data/app/controllers/refinery/products/admin/products_controller.rb

@@ -6,7 +6,57 @@ module Refinery
         crudify :'refinery/products/product',
                 :title_attribute => 'name', :xhr_paging => true
 
-      end
-    end
-  end
-end
+
+      # ----------------------------------------------------------------------
+        # override crudify create
+      # ----------------------------------------------------------------------
+        def create
+            # set this object as last object, given the conditions of this class.
+          params[:product].merge!({
+            :position => ((::Refinery::Products::Product.maximum(:position, :conditions => "")||-1) + 1)
+          })
+
+          @product = ::Refinery::Products::Product.new(params[:product])
+
+          if @product.valid? && @product.save
+              flash.notice = t( 'refinery.crudify.created', :what => "#{@product.name}")
+
+              # successful creation 
+            if params[:digi_download] == '1'  #   .. is digi_download needed too?
+              redirect_to refinery.new_products_admin_digidownload_path( :product_id => @product.id )
+            else   #..straightforward create;
+              redirect_to :back
+            end
+
+          else  # unsuccesful create
+            render :action => :new
+          end
+
+        end
+
+
+      # ----------------------------------------------------------------------
+        # override crudify update
+      # ----------------------------------------------------------------------
+        def update
+          if @product.update_attributes(params[:product])
+              # successful update
+            flash.notice = t( 'refinery.crudify.updated', :what => "#{@product.name}")
+
+            if params[:digi_download] == '1'  #   .. is digi_download needed too?
+              redirect_to refinery.new_products_admin_digidownload_path( :product_id => @product.id )
+            else   #..straightforward update
+              redirect_to :back
+            end
+
+          else  # ... failed update
+            render :action => :edit
+          end
+        end
+
+      # ----------------------------------------------------------------------
+      # ----------------------------------------------------------------------
+      end  #  class  
+    end  #  mod  
+  end  #  mod  
+end  #  mod  

data/app/controllers/refinery/products/digidownloads_controller.rb

@@ -0,0 +1,32 @@
+module Refinery
+  module Products
+    class DigidownloadsController <  ::Refinery::StoresApplicationController
+
+      helper  'refinery/stores/stores'
+      before_filter   :find_digidownload, :only => [:show, :download, :preview]
+
+      def index
+        @digidownloads = current_refinery_user.digidownloads
+        present(@page)
+      end
+
+      def show
+        present(@page)
+      end
+
+      def download
+        redirect_to @digidownload.doc.expiring_url(60)  # temp authenticated url expires in 60 sec
+      end
+
+    protected
+
+    def find_digidownload
+        # TODO: verify that digid belongs to current user 
+      @digidownload = ::Refinery::Products::Digidownload.find( params[:id] )
+      return false unless refinery_user_signed_in? && current_refinery_user == @digidownload.user
+    end
+
+
+    end
+  end
+end

data/app/controllers/refinery/products/products_controller.rb

@@ -1,8 +1,11 @@
 module Refinery
   module Products
     class ProductsController <  ::Refinery::StoresApplicationController
+
       before_filter :find_cart
 
+      helper  'refinery/stores/stores'
+
       def show
         @product = Product.find(params[:id])
 

data/app/controllers/refinery/stores/stores_controller.rb

@@ -3,6 +3,7 @@ module Refinery
     class StoresController < ::Refinery::StoresApplicationController
 
       before_filter :authenticate_refinery_user!, :only => :checkout
+
       before_filter :find_first_store, :only => :index
       before_filter :find_store, :only => :show
       before_filter :find_page, :except => [:index, :add_to_cart, :empty_cart, :checkout]
@@ -48,7 +49,7 @@ module Refinery
     if @cart.items.empty?
       redirect_to_index("Your cart is empty")
     else
-      @order = ::Refinery::Orders::Order.checkout!( @cart )
+      @order = ::Refinery::Orders::Order.checkout!( @cart, current_refinery_user )
       session[:cart] = nil
       redirect_to   refinery.edit_orders_order_path( @order )
     end
@@ -60,7 +61,7 @@ module Refinery
     flash[:notice] = msg if msg
     redirect_to refinery.stores_store_path( find_first_store )
   end
-    
+
  
     protected