shoppe 0.0.15 → 0.0.16

data/README.rdoc

@@ -0,0 +1 @@
+Hello.

data/Rakefile

@@ -4,7 +4,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../test/app/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
@@ -16,3 +16,23 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
+
+namespace :shoppe do
+  
+  desc "Generate RDoc documentation into doc/"
+  task :generate_docs do
+    system("rm -Rf doc")
+    system("bundle exec sdoc app/models lib README.rdoc")
+  end
+  
+  desc "Publish RDoc documentation from doc to api.tryshoppe.com"
+  task :publish_docs do
+    if File.exist?("doc")
+      system "ssh root@tryshoppe.com rm -Rf /var/www/shoppe-api"
+      system "scp -r doc root@tryshoppe.com:/var/www/shoppe-api"
+    else
+      puts "No doc/ folder found to publish."
+    end
+  end
+end
+

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

@@ -43,6 +43,11 @@ $ ->
   $('select.chosen').chosen()
   $('select.chosen-with-deselect').chosen({allow_single_deselect: true})
   
+  # Printables
+  $('a[rel=print]').on 'click', ->
+    window.open($(this).attr('href'), 'despatchnote', 'width=700,height=800')
+    false
+  
   # Open AJAX dialogs
   $('a[rel=dialog]').on 'click', ->
     element = $(this)

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

@@ -81,6 +81,7 @@ header.main {
 	h2.delivery_services { background-image:image-url('shoppe/icons/box.svg'); background-position: 0 3px; background-size:20px;}
 	h2.tax_rates { background-image:image-url('shoppe/icons/currency.svg'); background-position: 0 2px; background-size:22px;}
 	h2.users { background-image:image-url('shoppe/icons/id.svg'); background-position: 0 2px; background-size:22px;}
+	h2.settings { background-image:image-url('shoppe/icons/toolbox.svg'); background-position: 0 2px; background-size:22px;}
 
 }
 
@@ -154,10 +155,13 @@ header.main {
 				}
 				dd select { width:100%;}
 				dd textarea { height:80px;	}
-				dd p.help { margin-top:15px; color:#333; background:image-url('shoppe/icons/support.svg') no-repeat 0 1px; background-size:13px; padding-left:15px;}
+				dd p.help { margin-top:15px; color:#333; background:image-url('shoppe/icons/support.svg') no-repeat 0 3px; line-height:1.5; background-size:13px; padding-left:18px; opacity:0.7;}
 				dd.checkbox { margin-top:14px; font-size:1.1em; color:#999;}
 				dd.checkbox input { float:left; margin-right:10px; margin-top:2px; }
-				
+				dd div.radios {
+					padding-top:4px;
+					input,label { margin-right:10px;}
+				}
 				&.half {
 					width:49%;
 					margin:0;
@@ -172,9 +176,17 @@ header.main {
 					&:nth-child(2) { margin-left:2%; width:32%;}
 					&:last-child { float:right; width:33%;}
 				}
-				
 			}
 			
+			dl.sided {
+				clear:both;
+				dt { float:left; width:25%; text-align:right; padding-top:4px;}
+				dd { margin-left:30%; }
+				dd p.help { margin-top:10px;}
+				dd div.checkbox { padding-top:5px;}
+			}
+			
+			
 			//
 			// margined container
 			//
@@ -204,6 +216,7 @@ header.main {
 		p.submit .button { margin-right:5px;}
 		p.submit .right .button {margin-left:5px; margin-right:0;}
 		p.submit span.right { float:right;}
+		p.submit.sided { padding-left:30%;}
 		.errorExplanation {
 	    margin-bottom:25px;
 	    border:1px solid #EB2732;

data/app/assets/stylesheets/shoppe/elements.scss

@@ -49,6 +49,14 @@
     &:active { background:#e75d19}
   }
 
+  &.grey {
+    background-color:#777;
+    border-color:#777;
+    border-bottom-color:#777;
+    &:active { background:#888}
+  }
+
+
 	&.white {
 		background-color:#fff;
 		color:#333 !important;

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

@@ -0,0 +1,67 @@
+/*
+ *= require shoppe/reset
+*/
+html { font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; color:#000; font-size:12px;background:#efefef;}
+#content {
+	background:#fff;
+	margin:5%;
+	outline:1px solid #ccc;
+	padding:35px;
+}
+
+div.despatchNote {
+	header {
+		float:left;
+		h1 {
+			font-size:1.8em;
+			font-weight:300;
+		}
+		h2 { margin-top:5px; font-size:2.3em; font-weight:500; }
+		width:40%;
+	}
+	
+	.address {
+		border:1px solid #000;
+		padding:25px;
+		margin-left:45%;
+		line-height:1.5;
+		font-size:1.3em;
+		p.name { font-size:1.2em; font-weight:500;}
+	}
+	table.details {
+		width:100%;
+		margin:25px 0;
+		td, th {
+			border:1px solid #000;
+			padding:10px;
+			text-align:center;
+		}
+		th { background:#efefef;}
+	}
+	
+	table.items {
+		width:100%;
+		margin:25px 0;
+		td, th {
+			border:1px solid #000;
+			padding:10px;
+			text-align:center;
+			&.check { width:5%;}
+		}
+		th { background:#efefef;}
+	}
+	
+	p.footer {
+		font-size:1.2em;
+		border:1px solid #000;
+		padding:15px;
+		text-align:center;
+	}
+}
+
+
+@media print {
+	html { background:none;}
+	body {margin:5%;}
+	#content { margin:0; padding:0; outline:0;}
+}

data/app/controllers/shoppe/application_controller.rb

@@ -1,8 +1,6 @@
 module Shoppe
   class ApplicationController < ActionController::Base
     
-    # Require that a user is logged in for all parts of the Shoppe admin
-    # interface.
     before_filter :login_required
     
     rescue_from ActiveRecord::DeleteRestrictionError do |e|
@@ -16,39 +14,32 @@ module Shoppe
 
     private
 
-    # If not logged in, redirect users to the login page. This should be
-    # used in a before filter.
     def login_required
       unless logged_in?
         redirect_to login_path
       end
     end
 
-    # Is there a user currently logged in?
     def logged_in?
       current_user.is_a?(User)
     end
     
-    # Returns the currently logged in user
     def current_user
       @current_user ||= login_from_session || login_with_demo_mdoe || :false
     end
 
-    # Attempt to find a user based on the value stored in the local session
     def login_from_session
       if session[:shoppe_user_id]
         @user = User.find_by_id(session[:shoppe_user_id])
       end
     end
     
-    # Attempt to login using the demo mode
     def login_with_demo_mdoe
-      if Shoppe.config[:demo_mode]
+      if Shoppe.settings.demo_mode?
         @user = User.first
       end
     end
     
-    # Expose a current_user and logged_in? as helpers to views
     helper_method :current_user, :logged_in?
     
   end

data/app/controllers/shoppe/orders_controller.rb

@@ -38,6 +38,10 @@ module Shoppe
       @order.pay!(params[:payment_reference], params[:payment_method].blank? ? 'Unknown' : params[:payment_method])
       redirect_to @order, :notice => "Order has been marked as paid successfully"
     end
+    
+    def despatch_note
+      render :layout => 'shoppe/printable'
+    end
   
   end
 end

data/app/controllers/shoppe/sessions_controller.rb

@@ -1,5 +1,6 @@
 module Shoppe
   class SessionsController < Shoppe::ApplicationController
+
     layout 'shoppe/sub'
     skip_before_filter :login_required, :only => [:new, :create, :reset]
   

data/app/controllers/shoppe/settings_controller.rb

@@ -0,0 +1,12 @@
+module Shoppe
+  class SettingsController < ApplicationController
+    
+    before_filter { @active_nav = :settings }
+    
+    def update
+      Shoppe::Setting.update_from_hash(params[:settings].permit!)
+      redirect_to :settings, :notice => "Settings have been updated successfully."
+    end
+    
+  end
+end

data/app/controllers/shoppe/users_controller.rb

@@ -3,8 +3,8 @@ module Shoppe
   
     before_filter { @active_nav = :users }
     before_filter { params[:id] && @user = Shoppe::User.find(params[:id]) }
-    if Shoppe.config[:demo_mode]
-      before_filter(:only => [:create, :update, :destroy]) do
+    before_filter(:only => [:create, :update, :destroy]) do
+      if Shoppe.settings.demo_mode?
         raise Shoppe::Error, "You cannot make changes to user in demo mode. Sorry about that."
       end
     end

data/app/controllers/shoppe/variants_controller.rb

@@ -43,7 +43,7 @@ module Shoppe
     private
     
     def safe_params
-      params[:product].permit(:name, :permalink, :sku, :default_image_file, :price, :cost_price, :tax_rate_id, :weight, :stock_control, :active)
+      params[:product].permit(:name, :permalink, :sku, :default_image_file, :price, :cost_price, :tax_rate_id, :weight, :stock_control, :active, :default)
     end
     
   end

data/app/helpers/shoppe/application_helper.rb

@@ -1,10 +1,65 @@
-module Shoppe::ApplicationHelper
+module Shoppe
+  module ApplicationHelper
   
-  # Return all currencies with the currency provided by the Shoppe
-  # configuration file.
-  def number_to_currency(number, options = {})
-    options[:unit] ||= Shoppe.config[:currency_unit]
-    super
-  end
+    def number_to_currency(number, options = {})
+      options[:unit] ||= Shoppe.settings.currency_unit
+      super
+    end
+  
+    def number_to_weight(kg)
+      "#{kg}#{t('shoppe.helpers.number_to_weight.kg', :default => 'kg')}"
+    end
+  
+    def status_tag(status)
+      content_tag :span, status, :class => "status-tag #{status}"
+    end
   
-end
+    def attachment_preview(attachment, options = {})
+      if attachment
+        String.new.tap do |s|
+          if attachment.image?
+            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_path(attachment)}'>#{attachment.file_name}</a></span>"
+          s << "<span class='delete'>"
+          s << link_to(t('shoppe.helpers.attachment_preview.delete', :default => 'Delete this file?'), attachment_path(attachment), :method => :delete, :data => {:confirm => t('shoppe.helpers.attachment_preview.delete_confirm', :default => "Are you sure you wish to remove this attachment?")})
+          s << "</span>"
+          s << "</div>"
+          s << "</div>"
+        end.html_safe
+      elsif !options[:hide_if_blank]
+        "<div class='attachmentPreview'><div class='imgContainer'><div class='img none'></div></div><div class='desc none'>No attachment</div></div>".html_safe
+      end
+    end
+    
+    def settings_label(field)
+      "<label for='settings_#{field}'>#{t("shoppe.settings.labels.#{field}")}</label>".html_safe
+    end
+    
+    def settings_field(field, options = {})
+      default = t("shoppe.settings.defaults")[field.to_sym]
+      value = (params[:settings] && params[:settings][field]) || Shoppe.settings[field.to_s]
+      type = t("shoppe.settings.types")[field.to_sym] || 'string'
+      case type
+      when 'boolean'
+        String.new.tap do |s|
+          value = default if value.blank?
+          s << "<div class='radios'>"
+          s << radio_button_tag("settings[#{field}]", 'true', value == true, :id => "settings_#{field}_true")
+          s << label_tag("settings_#{field}_true", t("shoppe.settings.options.#{field}.affirmative", :default => 'Yes'))
+          s << radio_button_tag("settings[#{field}]", 'false', value == false, :id => "settings_#{field}_false")
+          s << label_tag("settings_#{field}_false", t("shoppe.settings.options.#{field}.negative", :default => 'No'))
+          s << "</div>"
+        end.html_safe
+      else
+        text_field_tag "settings[#{field}]", value, options.merge(:placeholder => default, :class => 'text')
+      end
+    end
+  
+  end
+end

data/app/mailers/shoppe/order_mailer.rb

@@ -1,27 +1,25 @@
 module Shoppe
   class OrderMailer < ActionMailer::Base
   
-    default :from => "#{Shoppe.config[:store_name]} <#{Shoppe.config[:email_address]}>"
-  
     def received(order)
       @order = order
-      mail :to => order.email_address, :subject => I18n.t('shoppe.order_mailer.received.subject', :default => "Order Confirmation")
+      mail :from => Shoppe.settings.outbound_email_address, :to => order.email_address, :subject => I18n.t('shoppe.order_mailer.received.subject', :default => "Order Confirmation")
     end
   
     def accepted(order)
       @order = order
-      mail :to => order.email_address, :subject => I18n.t('shoppe.order_mailer.received.accepted', :default => "Order Accepted")
+      mail :from => Shoppe.settings.outbound_email_address, :to => order.email_address, :subject => I18n.t('shoppe.order_mailer.received.accepted', :default => "Order Accepted")
     end
   
     def rejected(order)
       @order = order
-      mail :to => order.email_address, :subject => I18n.t('shoppe.order_mailer.received.rejected', :default => "Order Rejected")
+      mail :from => Shoppe.settings.outbound_email_address, :to => order.email_address, :subject => I18n.t('shoppe.order_mailer.received.rejected', :default => "Order Rejected")
     end
   
     def shipped(order)
       @order = order
-      mail :to => order.email_address, :subject => I18n.t('shoppe.order_mailer.received.shipped', :default => "Order Shipped")
+      mail :from => Shoppe.settings.outbound_email_address, :to => order.email_address, :subject => I18n.t('shoppe.order_mailer.received.shipped', :default => "Order Shipped")
     end
-  
+    
   end
 end

data/app/mailers/shoppe/user_mailer.rb

@@ -1,10 +1,10 @@
 module Shoppe
   class UserMailer < ActionMailer::Base
-    default :from => "#{Shoppe.config[:store_name]} <#{Shoppe.config[:email_address]}>"
 
     def new_password(user)
       @user = user
-      mail :to => user.email_address, :subject => "Your new Shoppe password"
+      mail :from => Shoppe.settings.outbound_email_address, :to => user.email_address, :subject => "Your new Shoppe password"
     end
+    
   end
 end

data/app/models/shoppe/country.rb

@@ -1,3 +1,17 @@
+# == Schema Information
+#
+# Table name: shoppe_countries
+#
+#  id        :integer          not null, primary key
+#  name      :string(255)
+#  code2     :string(255)
+#  code3     :string(255)
+#  continent :string(255)
+#  tld       :string(255)
+#  currency  :string(255)
+#  eu_member :boolean          default(FALSE)
+#
+
 module Shoppe
   class Country < ActiveRecord::Base
 
@@ -5,7 +19,9 @@ module Shoppe
     self.table_name = 'shoppe_countries'
 
     # Relationships
-    has_many :orders, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Order'
+    has_many :billed_orders, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Order', :foreign_key => 'billing_country_id'
+    has_many :delivered_orders, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Order', :foreign_key => 'delivery_country_id'
+    
     
     # Scopes
     scope :ordered, -> { order('shoppe_countries.name asc') }

data/app/models/shoppe/delivery_service.rb

@@ -1,3 +1,18 @@
+# == Schema Information
+#
+# Table name: shoppe_delivery_services
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)
+#  code         :string(255)
+#  default      :boolean          default(FALSE)
+#  active       :boolean          default(TRUE)
+#  created_at   :datetime
+#  updated_at   :datetime
+#  courier      :string(255)
+#  tracking_url :string(255)
+#
+
 module Shoppe
   class DeliveryService < ActiveRecord::Base