kkt_shoppe 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb53752d16704023abdca027c6e387744b60e4c9
-  data.tar.gz: 58f330c325c07e7e3e06d6cc4a3252a07889034d
+  metadata.gz: 719a80796260e15ea218d4a78869c737d6eceed4
+  data.tar.gz: 2189a7d3cdb909664b826bd1d0e6b1e11ce0b456
 SHA512:
-  metadata.gz: 98dd5d416ce71c145558bb2188a9898cc97f513d232a9b75d9ed8edf9bb9c69733ec85f3df2e69e3f503db3f8b824421c6c301e816bf6e4f212190bb5666d8ff
-  data.tar.gz: b1d45698bf1f00c6b78eb29342751cb5d821d63f328995d0fb731737297c97b7646b90c1723d8df9a980ed527ee8c4a37d2236429bb3b628019af3f46b031597
+  metadata.gz: 47b89d3a16cf2a107ab4759b913e587d29d707d3ce27da1d131cf6cae0d7b2eca6bea5544903fa73f11e19dfeb648a93a60371b0931378cb1b959afa093859c5
+  data.tar.gz: 1b77c3b4d1e15fee2b434d101f9f7d6bfbd13fbe68ada0293c3d3c02f499fc2b5ae41704fc9509bc36aef3f75bd2b51286ca8b22ccea10c203fc77905a8ea949

data/README.md

@@ -39,6 +39,7 @@ instructions below and you'll be up and running in minutes.
     echo "gem 'kkt_shoppe', '~> 1.0'" >> Gemfile
     bundle
     rails generate kkt_shoppe:setup
+    rails generate nifty:attachments:migration
     rails generate nifty:key_value_store:migration
     rake db:migrate kkt_shoppe:setup
     rails server

data/app/assets/javascripts/kkt_shoppe/application.coffee

@@ -42,11 +42,6 @@ $ ->
       helper.children().each (index)->
         $(this).width(originals.eq(index).width())
       helper
-
-  $('a[data-behavior=addAttachmentToExtraAttachments]').on 'click', (event) ->
-    event.preventDefault();
-    $('div.extraAttachments').show();
-    $(this).hide();
   
   # Chosen
   $('select.chosen').chosen()

data/app/assets/stylesheets/kkt_shoppe/application.scss

@@ -183,7 +183,7 @@ header.main {
 					width:49%;
 					margin:0;
 					float:left;
-					&:nth-child(2) { float:right;}
+					&:last-child { float:right;}
 				}
 
 				&.third {
@@ -299,17 +299,6 @@ header.main {
 	  }
 	}
 
-	div.extraAttachments{
-		display: none;
-
-		dl.half { margin-top: 15px; }
-	}
-
-	p.addAttachments {
-		float: right;
-		margin: 15px 25px 0 0;
-	}
-
 	//
 	// attachment preview
 	//

data/app/assets/stylesheets/kkt_shoppe/printable.scss

@@ -64,4 +64,4 @@ div.despatchNote {
 	html { background:none;}
 	body {margin:5%;}
 	#content { margin:0; padding:0; outline:0;}
-}
+}

data/app/assets/stylesheets/kkt_shoppe/sub.scss

@@ -103,4 +103,4 @@ html.login {
     }
   }
   
-}
+}

data/app/controllers/kkt_shoppe/addresses_controller.rb

@@ -44,4 +44,4 @@ module KktShoppe
     end
 
   end
-end
+end

data/app/controllers/kkt_shoppe/attachments_controller.rb

@@ -2,7 +2,7 @@ module KktShoppe
   class AttachmentsController < KktShoppe::ApplicationController
 
     def destroy
-      @attachment = Shoppe::Attachment.find_by!(token: params[:id])
+      @attachment = Nifty::Attachments::Attachment.find(params[:id])
       @attachment.destroy
       respond_to do |wants|
         wants.html { redirect_to request.referer, :notice => t('kkt_shoppe.attachments.remove_notice')}

data/app/controllers/kkt_shoppe/customers_controller.rb

@@ -52,4 +52,4 @@ module KktShoppe
     end
 
   end
-end
+end

data/app/controllers/kkt_shoppe/products_controller.rb

@@ -5,7 +5,7 @@ module KktShoppe
     before_filter { params[:id] && @product = KktShoppe::Product.root.find(params[:id]) }
 
     def index
-      @products = KktShoppe::Product.root.includes(:translations, :stock_level_adjustments, :product_categories, :variants).order(:name).group_by(&:product_category).sort_by { |cat,pro| cat.name }
+      @products = KktShoppe::Product.root.includes(:translations, :stock_level_adjustments, :default_image, :product_categories, :variants).order(:name).group_by(&:product_category).sort_by { |cat,pro| cat.name }
     end
 
     def new
@@ -51,8 +51,7 @@ module KktShoppe
     private
 
     def safe_params
-      file_params = [:file, :parent_id, :role, :parent_type, :file => []]
-      params[:product].permit(:name, :sku, :permalink, :description, :short_description, :weight, :price, :cost_price, :tax_rate_id, :stock_control, :active, :featured, :in_the_box, :attachments => [:default_image => file_params, :data_sheet => file_params, :extra => file_params], :product_attributes_array => [:key, :value, :searchable, :public], :product_category_ids => [])
+      params[:product].permit(:name, :sku, :permalink, :description, :short_description, :weight, :price, :cost_price, :tax_rate_id, :stock_control, :default_image_file, :data_sheet_file, :active, :featured, :in_the_box, :product_attributes_array => [:key, :value, :searchable, :public], :product_category_ids => [])
     end
 
   end

data/app/helpers/kkt_shoppe/application_helper.rb

@@ -10,19 +10,19 @@ module KktShoppe
     end
 
     def attachment_preview(attachment, options = {})
-      if attachment.present? and attachment.token.present?
+      if attachment
         String.new.tap do |s|
           if attachment.image?
-            style = "style='background-image:url(#{attachment.file.thumb.url})'"
+            style = "style='background-image:url(#{attachment.path})'"
           else
             style = ''
           end
           s << "<div class='attachmentPreview #{attachment.image? ? 'image' : 'doc'}'>"
           s << "<div class='imgContainer'><div class='img' #{style}></div></div>"
           s << "<div class='desc'>"
-          s << "<span class='filename'><a href='#{attachment.file.url}'>#{attachment.file_name}</a></span>"
+          s << "<span class='filename'><a href='#{attachment_path(attachment)}'>#{attachment.file_name}</a></span>"
           s << "<span class='delete'>"
-          s << link_to(t('helpers.attachment_preview.delete', :default => 'Delete this file?'), attachment_path(attachment.token), :method => :delete, :data => {:confirm => t('helpers.attachment_preview.delete_confirm', :default => "Are you sure you wish to remove this attachment?")})
+          s << link_to(t('helpers.attachment_preview.delete', :default => 'Delete this file?'), attachment_path(attachment), :method => :delete, :data => {:confirm => t('helpers.attachment_preview.delete_confirm', :default => "Are you sure you wish to remove this attachment?")})
           s << "</span>"
           s << "</div>"
           s << "</div>"

data/app/helpers/kkt_shoppe/product_category_helper.rb

@@ -33,4 +33,4 @@ module KktShoppe
     end
 
   end
-end
+end

data/app/models/kkt_shoppe/customer.rb

@@ -38,4 +38,4 @@ module KktShoppe
     end
 
   end
-end
+end

data/app/models/kkt_shoppe/order/actions.rb

@@ -60,7 +60,7 @@ module KktShoppe
         self.status = 'accepted'
         self.save!
         self.order_items.each(&:accept!)
-        #deliver_accepted_order_email
+        deliver_accepted_order_email
       end
     end
   
@@ -74,7 +74,7 @@ module KktShoppe
         self.status = 'rejected'
         self.save!
         self.order_items.each(&:reject!)
-        #deliver_rejected_order_email
+        deliver_rejected_order_email
       end
     end
 

data/app/models/kkt_shoppe/order/delivery.rb

@@ -221,7 +221,7 @@ module KktShoppe
         self.status = 'shipped'
         self.consignment_number = consignment_number
         self.save!
-        #KktShoppe::OrderMailer.shipped(self).deliver_now
+        KktShoppe::OrderMailer.shipped(self).deliver_now
       end
     end
 

data/app/models/kkt_shoppe/product.rb

@@ -10,8 +10,9 @@ module KktShoppe
     require_dependency 'kkt_shoppe/product/product_attributes'
     require_dependency 'kkt_shoppe/product/variants'
 
-    # Attachments for this product
-    has_many :attachments, :as => :parent, :dependent => :destroy, :autosave => true, :class_name => "Shoppe::Attachment"
+    # Products have a default_image and a data_sheet
+    attachment :default_image
+    attachment :data_sheet
 
     # The product's categorizations
     #
@@ -62,13 +63,6 @@ module KktShoppe
     translates :name, :permalink, :description, :short_description
     scope :ordered, -> { includes(:translations).order(:name) }
 
-    def attachments=(attrs)
-      if attrs["default_image"]["file"].present? then self.attachments.build(attrs["default_image"]) end
-      if attrs["data_sheet"]["file"].present? then self.attachments.build(attrs["data_sheet"]) end
-
-      if attrs["extra"]["file"].present? then attrs["extra"]["file"].each { |attr| self.attachments.build(file: attr, parent_id: attrs["extra"]["parent_id"], parent_type: attrs["extra"]["parent_type"]) } end
-    end
-
     # Return the name of the product
     #
     # @return [String]
@@ -114,20 +108,6 @@ module KktShoppe
       self.product_categories.first rescue nil
     end
 
-    # Return attachment for the default_image role
-    # 
-    # @return [String]
-    def default_image
-      self.attachments.for("default_image")
-    end
-
-    # Return attachment for the data_sheet role
-    # 
-    # @return [String]
-    def data_sheet
-      self.attachments.for("data_sheet")
-    end
-
     # Search for products which include the given attributes and return an active record
     # scope of these products. Chainable with other scopes and with_attributes methods.
     # For example:

data/app/models/kkt_shoppe/product_category.rb

@@ -12,8 +12,8 @@ module KktShoppe
 
     self.table_name = 'kkt_shoppe_product_categories'
 
-    # Attachments for this product category
-    has_many :attachments, :as => :parent, :dependent => :destroy, :class_name => "Shoppe::Attachment"
+    # Categories have an image attachment
+    attachment :image
 
     # All products within this category
     has_many :product_categorizations, dependent: :restrict_with_exception, class_name: 'KktShoppe::ProductCategorization', inverse_of: :product_category
@@ -51,13 +51,6 @@ module KktShoppe
       parent.hierarchy_array.concat [self]
     end
 
-    # Attachment with the role image
-    # 
-    # @return [String]
-    def image
-      self.attachments.for("image")
-    end
-
     private
 
     def set_permalink

data/app/views/kkt_shoppe/customers/show.html.haml

@@ -50,4 +50,4 @@
                     - for item in order.order_items
                       %li #{item.quantity} x #{item.ordered_item.full_name}
                 %td= number_to_currency order.total
-                %td= boolean_tag order.paid_in_full?, nil, :true_text => number_to_currency(order.amount_paid), :false_text => number_to_currency(order.amount_paid)
+                %td= boolean_tag order.paid_in_full?, nil, :true_text => number_to_currency(order.amount_paid), :false_text => number_to_currency(order.amount_paid)

data/app/views/kkt_shoppe/order_mailer/received.text.erb

@@ -2,8 +2,11 @@ Hello <%=@order.first_name%>!
 
 Re: Order #<%=@order.number%>
 
-We're just emailing you to let you know that we have received your order!
+We're pleased to let you know that we have received your order and one of our team will be accepting it shortly.
+
+We will e-mail you again when your order has been accepted.
+
+Many thanks,
 
-Thanks,
 <%=KktShoppe.settings.store_name%>
 <%=KktShoppe.settings.email_address%>

data/app/views/kkt_shoppe/product_categories/_form.html.haml

@@ -47,4 +47,4 @@
   %p.submit
     - unless @product_category.new_record?
       %span.right= link_to t('kkt_shoppe.delete') , @product_category, :class => 'button purple', :method => :delete, :data => {:confirm => t('kkt_shoppe.product_category.delete_confirmation') }
-    = f.submit t('kkt_shoppe.submit'),  :class => 'button green'
+    = f.submit t('kkt_shoppe.submit'),  :class => 'button green'

data/app/views/kkt_shoppe/product_localisations/form.html.haml

@@ -29,4 +29,4 @@
     %p.submit
       - unless @localisation.new_record?
         %span.right= link_to t('kkt_shoppe.delete'), product_localisation_path(@product, @localisation), :class => 'button purple', :method => :delete, :data => {:confirm => t('kkt_shoppe.localisations.delete_confirmation')}
-      = f.submit t('kkt_shoppe.localisations.save_localisation'), :class => 'button green'
+      = f.submit t('kkt_shoppe.localisations.save_localisation'), :class => 'button green'

data/app/views/kkt_shoppe/products/_form.html.haml

@@ -57,35 +57,15 @@
   = field_set_tag t('kkt_shoppe.products.attachments') do
     .splitContainer
       %dl.half
-        %dt= f.label "attachments[default_image][file]", t('kkt_shoppe.products.default_image')
+        %dt= f.label :default_image_file, t('kkt_shoppe.products.default_image')
         %dd
           = attachment_preview @product.default_image
-          %p= f.file_field "attachments[default_image][file]"
-          = f.hidden_field "attachments[default_image][role]", value: "default_image"
-          = f.hidden_field "attachments[default_image][parent_id]", value: @product.id
+          %p= f.file_field :default_image_file
       %dl.half
-        %dt= f.label "attachments[data_sheet][file]", t('kkt_shoppe.products.datasheet')
+        %dt= f.label :data_sheet_file, t('kkt_shoppe.products.datasheet')
         %dd
           = attachment_preview @product.data_sheet
-          %p= f.file_field "attachments[data_sheet][file]"
-          = f.hidden_field "attachments[data_sheet][role]", value: "data_sheet"
-          = f.hidden_field "attachments[data_sheet][parent_id]", value: @product.id
-
-    .splitContainer.extraAttachments
-      %dl.half
-        %dd
-          = attachment_preview nil, hide_if_blank: false
-          %p= f.file_field "attachments[extra][file]", :multiple => true
-          = f.hidden_field "attachments[extra][parent_type]", value: "KktShoppe::Product"
-          = f.hidden_field "attachments[extra][parent_id]", value: @product.id
-
-      - @product.attachments.each do |attachment|
-        - unless ["default_image", "data_sheet"].include?(attachment.role)
-          %dl.half
-            %dd
-              = attachment_preview attachment
-
-    %p.addAttachments= link_to t('kkt_shoppe.products.add_attachments') , '#', :data => {:behavior => 'addAttachmentToExtraAttachments'}, :class => 'button button-mini green'
+          %p= f.file_field :data_sheet_file
 
   - unless @product.has_variants?
     = field_set_tag t('kkt_shoppe.products.pricing') do