caboose-store 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjU1ZWNkN2I3NWI0NGU1YzUwZDg3NmM1ODM3OWQ3YmUxODU0MzBkZQ==
+    NTExZjkxMWRiMTRiZWQzYzBmYTJkZWFkOTNjNmQ2N2MxZjRmODgzMw==
   data.tar.gz: !binary |-
-    ZDZhOThkZTcxMmM1YzJjN2Y4YjQzMDE0ODk5NjE0N2UxODNmNGE4Mg==
+    NjA2MTk2YTBiOWQ5NmY5MTAxNDg4ZGRjNjZhOGNlZDY5ZDhmZmVlZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTgzZDdjMTFkYzAwZjFkM2FlMjdkNDdlZmFmMTQ3ZmIyOTk5MDc2YmU5NzRi
-    OTgxOTI4NGJlMTZkNDZjNmY4YmNiMDYyMDE1ZTE5MDYwYTFlNDNhMmJlOWY3
-    ZWY4ZjZmNDliYWQzZGUxODk0NzM0YjA1YjRlOGE4Mzg5OGJjMTM=
+    M2IyZTUxYjlkMWQ0MTBhY2MyYmMzOTU3ODc5ZGM2MTg3ZTAyYjQyNWFlZTRl
+    NTBhNjM5NGJhN2RmMjQ2MzYxYzU2Mjk0NDExNzVlNDA5MzI1NzRkOTUzMTJi
+    MjJmY2NhYmE5ZTY1Y2IwNmZjYjJmZGM4ODczYjdmMDkwNmRkY2E=
   data.tar.gz: !binary |-
-    NjE0Y2I5NmM2NGUzNjUzZTVlOWZlZDI5MzRlZGFiNWQ2MWQyZGMxY2JiYTcw
-    NTc2M2Q4YTkxMjYwNThjMmQ2MDIyZjA5ZmZhMmI1MDZlYzY1MmU2YzEyODRk
-    NGNhMTdkZGQwMjk2ODJkNzJiYjkxNDc0MzdkODZiYjYzMjJmOWY=
+    YmQ0MzAxYWE5NGNlYzhkYWZiZjZhM2Y4ODRiNDVlY2VhYTgxODZhNTVmYmE0
+    OWJlYTUyMTM2OGY0NmY3OTY0MThhYmNkNTVmMzU0ZTc0YjU1MWFmZTA0YmRh
+    M2NhMGRiMjc2NTMxY2YwOWIxZTRiZjRiYWNjYTZjMzYxOTZkYWI=

data/app/controllers/caboose_store/products_controller.rb

@@ -7,37 +7,54 @@ module CabooseStore
       @review = Review.new
           
       if @category.nil?
-        @product = Product.find(params[:id])
-        if @product.status == 'Inactive'
-          render 'products/not_available'
-          return
-        end
-        @reviews = Review.where(:product_id => @product.id).limit(10).order("id DESC") || nil
-        @is_logged_in = logged_in?
-        if @is_logged_in
-          #@order.customer_id = logged_in_user.id
-          #@order.save
-          @first_name = logged_in_user.first_name
-          @last_name = logged_in_user.last_name
-        end
-  
-        all_reviews = Review.where(:product_id => @product.id)
-        score = 0
-        count = 0
-        all_reviews.each do |r|
-          if r.rating && r.rating != 0
-            score += r.rating
-            count += 1
-          end
-        end
-        if count > 0
-          @average = score / count
+        if params[:id].nil? || !Product.exists?(params[:id])
+          
+          @gen = Caboose::PageBarGenerator.new(params, {
+            'title_like'    => '',
+            'id'            => ''
+          },{
+              'model'       => 'CabooseStore::Product',
+              'sort'        => 'title',
+              'desc'        => false,
+              'base_url'    => '/admin/products'
+          })
+          @products = @gen.items
+          render 'caboose_store/products/search'
+          
         else
-          @average = 0
+          
+          @product = Product.find(params[:id])
+          
+          if @product.status == 'Inactive'
+            render 'products/not_available'
+            return
+          end
+          @reviews = Review.where(:product_id => @product.id).limit(10).order("id DESC") || nil
+          @is_logged_in = logged_in?
+          if @is_logged_in
+            #@order.customer_id = logged_in_user.id
+            #@order.save
+            @first_name = logged_in_user.first_name
+            @last_name = logged_in_user.last_name
+          end
+          
+          all_reviews = Review.where(:product_id => @product.id)
+          score = 0
+          count = 0
+          all_reviews.each do |r|
+            if r.rating && r.rating != 0
+              score += r.rating
+              count += 1
+            end
+          end
+          if count > 0
+            @average = score / count
+          else
+            @average = 0
+          end
+          
+          render 'caboose_store/products/details'
         end
-  
-        # @breadcrumb = p.category.ancestry.collect{|cat| "<li><a href='/products/#{cat.id}'>#{cat.name}</a></li>"}.join("<span class='divider'>/</span>")
-        render 'caboose_store/products/details'      
       end
     end
   
@@ -383,5 +400,38 @@ module CabooseStore
       end
       render :json => options
     end
+    
+    # GET /admin/products/combine
+    def admin_combine_select_products
+    end
+    
+    # GET /admin/products/combine-step2
+    def admin_combine_assign_title
+    
+    # POST /admin/products/combine
+    def admin_combine
+      product_ids = params[:product_ids]
+      
+      p = Product.new
+      p.title       = params[:title]
+      p.description = params[:description]
+      p.option1     = params[:option1]
+      p.option2     = params[:option2]
+      p.option3     = params[:option3]      
+      p.default1    = params[:default1]
+      p.default2    = params[:default2]
+      p.default3    = params[:default3]
+      p.status      = 'Active'
+      p.save
+      
+      
+      
+      product_ids.each do |pid|
+        p = Product.find(pid)
+        p.variants.each do |v|
+        
+      
+    end
+    
   end
 end

data/app/models/caboose_store/product_image.rb

@@ -3,7 +3,9 @@ module CabooseStore
     self.table_name = "store_product_images"
     
     belongs_to :product
-    has_and_belongs_to_many :variants  
+    has_many :product_image_variants
+    has_many :variants, :through => :product_image_variants    
+      
     attr_accessible :id, :title  
     has_attached_file :image,
       #:path => "#{Rails.root}/public/products/:product_id_:id_:style.:extension",

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-store
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms