nimbleshop_core 0.0.5 → 0.0.7

data/app/assets/javascripts/admin.js

@@ -15,11 +15,13 @@
 //= require utils/formatPrice
 //= require loading_state_for_buttons
 
-//= require payment_method
-//= require product-group-condition
-//= require shipit
+//= require admin/payment_method
+//= require admin/product-group-condition
+//= require admin/shipit
 //= require admin/shipping_methods/edit
 //= require admin/products/edit
-//= require fadeout_success
+//= require admin/utils/fadeout_success
 //= require autoresize
+
+//comes from twitter-bootstrap
 //= require show_help_on_hover

data/app/assets/javascripts/admin/payment_method.js.coffee

@@ -0,0 +1,26 @@
+window.Nimbleshop = {} if typeof(Nimbleshop) == 'undefined'
+
+Nimbleshop.managePaymentMethods = class ManagePaymentMethods
+  constructor: ->
+    @cancelPaymentForm()
+    @editPaymentForm()
+
+  cancelPaymentForm: ->
+    $(".nimbleshop-payment-method-form .cancel").click ->
+      $this = $(this)
+      div = $this.closest(".nimbleshop-payment-method-form-well")
+      div.hide()  if div.length
+      false
+
+  editPaymentForm: ->
+    $(".nimbleshop-payment-method-edit").click ->
+      $this = $(this)
+      well = $this.parent("div").find(".nimbleshop-payment-method-form-well")
+      if well.length
+        visible = well.is(":visible")
+        well.toggle(!visible)
+      false
+
+
+$ ->
+  new Nimbleshop.managePaymentMethods

data/app/assets/javascripts/admin/products/edit.js.coffee

@@ -1,19 +1,32 @@
-$ ->
+window.Nimbleshop = {} if typeof(Nimbleshop) == 'undefined'
 
+$ ->
   # work around the nested form ugliness
   $("form input:file").parents('.fields').hide()
 
-  # deleting a picture
-  $(".product_pictures .actions .delete").on "click", ->
-    $("#delete_picture_" + $(this).attr("data-action-id")).trigger "click"
-    $(this).parent().parent().hide "fast"
-    false
 
-  # making picutures sortable
-  $(".product_pictures").sortable(update: (e, ui) ->
-    orders = {}
-    $(".product_pictures li").each (index, el) ->
-      orders[index] = $(el).attr("data-id")
 
-    $("#product_pictures_order").attr "value", $.toJSON(orders)
-  ).disableSelection()
+
+Nimbleshop.managePicture = class ManagePicture
+  constructor: ->
+    @deletePicture()
+    @makePictureSortable()
+
+  deletePicture: ->
+    $(".product_pictures .actions .delete").on "click", ->
+      $("#delete_picture_" + $(this).attr("data-action-id")).trigger "click"
+      $(this).parent().parent().hide "fast"
+      false
+
+   makePictureSortable: ->
+    $(".product_pictures").sortable(update: ->
+      order = {}
+      $(".product_pictures li").each (index, elem) ->
+        order[index] = $(elem).attr("data-id")
+
+      $("#product_pictures_order").attr "value", $.toJSON(order)
+    ).disableSelection()
+
+
+$ ->
+  new Nimbleshop.managePicture

data/app/assets/javascripts/admin/shipit.js.coffee

@@ -0,0 +1,10 @@
+$ ->
+  $("a.ship-items-link").on 'click', ->
+    $(this).hide()
+    $("#ship_items_action_box").show()
+    false
+
+  $("#ship_items_cancel").on "click", ->
+    $("a.ship-items-link").show()
+    $("#ship_items_action_box").hide()
+    false

data/app/assets/stylesheets/admin_custom.css

@@ -11,8 +11,8 @@
 }
 
 .payment-method-engine-well {
-  border: 1px solid #999;
-  background-color: #eee;
+  border: 1px solid #dfdfdf;
+  background-color: #fbfbfb;
   padding: 10px;
 }
 
@@ -36,13 +36,13 @@
 }
 
 .nimbleshop-payment-method-edit {
-  float:left; 
+  float:left;
   margin-left:10px;
   margin-right:10px;
 }
 
 .nimbleshop-payment-method-delete {
-  float:left; 
+  float:left;
   margin-left:6px;
   margin-right:10px;
 }

data/app/controllers/admin_controller.rb

@@ -16,15 +16,11 @@ class AdminController < ::ApplicationController
   def restricted_access
     return unless Nimbleshop.config.ask_admin_to_login
 
-    authenticate_or_request_with_http_basic('staging') { |username, password|
+    authenticate_or_request_with_http_basic('nimbleshop') { |username, password|
       username == Nimbleshop.config.admin_email && password == Nimbleshop.config.admin_password
     }
   end
 
-  def delayed_job_admin_authentication
-    return true if Rails.env.development? || Rails.env.test?
-  end
-
   def no_page_title
     @do_not_use_page_title = true
   end

data/app/models/order.rb

@@ -1,5 +1,7 @@
 class Order < ActiveRecord::Base
 
+  include PaymentTransitions
+
   # to allow extensions to store any type of information
   store :metadata
 
@@ -103,17 +105,13 @@ class Order < ActiveRecord::Base
   end
 
   def total_amount_in_cents
-    Util.in_cents(total_amount)
+    Nimbleshop::Util.in_cents(total_amount)
   end
 
   def to_param
     number
   end
 
-  def final_billing_address
-    (shipping_address && !shipping_address.use_for_billing) ? billing_address : shipping_address
-  end
-
   def initialize_addresses
     shipping_address || build_shipping_address(country_code: "US", use_for_billing: true)
     billing_address || build_billing_address(country_code: "US", use_for_billing: false)
@@ -123,6 +121,13 @@ class Order < ActiveRecord::Base
     billing_address_same_as_shipping
   end
 
+  # If billing_address is same as shipping_address then order.billing_address returns nil .
+  # order.real_billing_address will always returns a valid address
+  def real_billing_address
+    (shipping_address && !shipping_address.use_for_billing) ? billing_address : shipping_address
+  end
+  alias_method :final_billing_address, :real_billing_address
+
   def line_item_for(product_id)
     line_items.find_by_product_id(product_id)
   end
@@ -151,7 +156,7 @@ class Order < ActiveRecord::Base
   end
 
   def after_shipped
-    Mailer.delay.shipment_notification_to_buyer(number)
+    Nimbleshop.config.mailer.constantize.delay.shipment_notification_to_buyer(number)
     touch(:shipped_at)
   end
 

data/app/{observers/order_observer.rb → models/order/payment_transitions.rb}

@@ -1,4 +1,4 @@
-class OrderObserver < ActiveRecord::Observer
+module Order::PaymentTransitions
 
   # All the methods listed below get transition object as the second
   # parameter. It is an instance of +StateMachine::Transition+.
@@ -16,7 +16,8 @@ class OrderObserver < ActiveRecord::Observer
   #
 
   def after_purchase(order, transition)
-    Mailer.delay.order_notification_to_buyer(order.number)
+    mailer = Nimbleshop.config.mailer.constantize
+    mailer.delay.order_notification_to_buyer(order.number)
     AdminMailer.delay.new_order_notification(order.number)
 
     order.mark_as_purchased!
@@ -25,7 +26,8 @@ class OrderObserver < ActiveRecord::Observer
   end
 
   def after_authorize(order, transition)
-    Mailer.delay.order_notification_to_buyer(order.number)
+    mailer = Nimbleshop.config.mailer.constantize
+    mailer.delay.order_notification_to_buyer(order.number)
     AdminMailer.delay.new_order_notification(order.number)
 
     order.mark_as_purchased!
@@ -37,7 +39,8 @@ class OrderObserver < ActiveRecord::Observer
 
   def after_pending(order, transition)
     if order.payment_method.is_a? NimbleshopCod::Cod
-      Mailer.delay.order_notification_to_buyer(order.number)
+      mailer = Nimbleshop.config.mailer.constantize
+      mailer.order_notification_to_buyer(order.number).deliver
       AdminMailer.delay.new_order_notification(order.number)
     end
 

data/app/views/admin/shipping_zones/_form.html.erb

@@ -16,7 +16,7 @@
       <div class="control-group">
         <%= f.label :country_code, "Country name", class: 'control-label' %>
         <div class="controls">
-          <%= f.select :country_code, Util.unconfigured_shipping_zone_countries, class: 'xlarge focus', size: 30 %>
+          <%= f.select :country_code, Nimbleshop::Util.unconfigured_shipping_zone_countries, class: 'xlarge focus', size: 30 %>
         </div>
       </div>
     </fieldset>

data/app/views/mailer/shipment_notification_to_buyer.text.erb

@@ -30,5 +30,5 @@ Item total price: <%= number_to_currency(line_item.price) %>
 <% end %>
 
 <% if @order.payment_method.permalink == 'authorize-net' %>
-Your credit card has been charged <%= number_to_currency(@order.total_amount) %> .This charge will appear on your credit card statement as "<%= @order.payment_method.company_name_on_creditcard_statement%>".
+Your credit card has been charged <%= number_to_currency(@order.total_amount) %> .This charge will appear on your credit card statement as "<%= @order.payment_method.business_name %>".
 <% end %>

data/config/routes.rb

@@ -4,6 +4,9 @@ Rails.application.routes.draw do
 
   get '/admin',           to: 'admin/main#index'
 
+  # Ideally it should only be included in development mode
+  get "/reset",           to: "carts#reset"
+
   namespace :admin do
 
     resource  :shop,            only: [:update, :edit]
@@ -42,7 +45,7 @@ Rails.application.routes.draw do
     end
 
     resources :link_groups do
-      resources :navigations, only: [:create, :new, :destroy] 
+      resources :navigations, only: [:create, :new, :destroy]
     end
 
   end

data/db/migrate/{20111107035350_create_creditcard_transactions.rb → 20111107035350_create_payment_transactions.rb}

@@ -1,4 +1,4 @@
-class CreateCreditcardTransactions < ActiveRecord::Migration
+class CreatePaymentTransactions < ActiveRecord::Migration
   def change
     create_table :payment_transactions do |t|
       t.belongs_to  :order,           null: false

data/lib/generators/nimbleshop/app/install_generator.rb

@@ -64,6 +64,7 @@ module Nimbleshop
       handle_localtunnel_callback_file
       handle_nimbleshop_yml_file
 
+      template "config/initializers/001_load_nimbleshop_config.rb", "#{destination_path}/config/initializers/001_load_nimbleshop_config.rb"
       template "config/initializers/cache_images.rb", "#{destination_path}/config/initializers/cache_images.rb"
       template "config/initializers/carrierwave.rb",  "#{destination_path}/config/initializers/carrierwave.rb"
       template "config/initializers/delayed_job.rb",  "#{destination_path}/config/initializers/delayed_job.rb"

data/lib/generators/nimbleshop/app/templates/config/initializers/001_load_nimbleshop_config.rb

@@ -0,0 +1,10 @@
+# TODO why rescue
+Settings = Nimbleshop::Util.config2hash(Rails.root.join('config', 'nimbleshop.yml')) rescue nil
+
+module Nimbleshop
+  extend self
+
+  def config
+    Settings
+  end
+end

data/lib/generators/nimbleshop/app/templates/config/initializers/setup_email.rb

@@ -6,8 +6,8 @@ else
 
   ActionMailer::Base.delivery_method = :smtp
   ActionMailer::Base.smtp_settings = {
-    user_name:      Nimbleshop.config.mailtrapio.username || "nimbleshop",
-    password:       Nimbleshop.config.mailtrapio.password || "7663e1f272637a4b",
+    user_name:      Nimbleshop.config.mailtrapio.username,
+    password:       Nimbleshop.config.mailtrapio.password,
     address:        "mailtrap.io",
     port:           2525,
     authentication: :plain }

data/lib/generators/nimbleshop/app/templates/config/nimbleshop.yml

@@ -5,6 +5,7 @@
 common:
   google_analytics_tracking_id: <%= ENV['GOOGLE_ANALYTICS_TRACKING_ID'] %>
   deliver_email: false
+  mailer: NimbleshopSimply::Mailer
 
   # this is used for IPN notification and other places where external serivce cannot ping localhost
   use_localhost2public_url: true
@@ -21,7 +22,7 @@ common:
 
   mailtrapio:
     username: <%= ENV['MAILTRAPIO_USERNAME'] || 'nimbleshop' %>
-    password: <%= ENV['MAILTRAPIO_PASSWORD'] || '7663e1f272637a4b' %>
+    password: <%= ENV['MAILTRAPIO_PASSWORD'] || 'f42c2934fbc2e229' %>
 
 development:
   use_s3: false

data/lib/nimbleshop/engine.rb

@@ -5,11 +5,12 @@ module Nimbleshop
 
     config.autoload_paths += %W(#{config.root}/lib)
     config.autoload_paths += %W(#{config.root}/lib/nimbleshop)
-    config.active_record.observers = :order_observer
 
-    config.to_prepare do
-      Address
-      ShippingZone
+    initializer 'nimbleshop_core.config_to_prepare' do |app|
+      app.config.to_prepare do
+        Address
+        ShippingZone
+      end
     end
 
     initializer 'nimbleshop_core.action_controller' do |app|

data/lib/nimbleshop/nimbleshop/util.rb

@@ -0,0 +1,63 @@
+
+module Nimbleshop
+  class Util
+
+    # loads a yaml based configuration file and returns hash
+    def self.config2hash(file)
+      hash = YAML.load(ERB.new(File.read(file)).result)
+
+      common_hash = hash['common'] || {}
+      env_hash = hash[Rails.env.to_s] || {}
+
+      final_hash = common_hash.deep_merge(env_hash)
+      Hashr.new(final_hash)
+    end
+
+    # Converts the amount in cents and returns an integer.
+    def self.in_cents(amount)
+      (BigDecimal(amount.to_s) * 100).round(0).to_i
+    end
+
+    # returns public url for a given localhost url
+    #
+    # Usage: localhost2public_url ( '/nimbleshop_paypal/notify', 'http' )
+    #
+    def self.localhost2public_url(url, protocol)
+      return url unless Nimbleshop.config.use_localhost2public_url
+
+      tunnel = Rails.root.join('config', '.tunnel')
+      return Nimbleshop.config.default_localhost2public_url unless File.exists?(tunnel)
+
+      path = []
+
+      host = File.open(tunnel, "r").gets.sub("\n", "")
+      path << "#{protocol}://#{host}"
+
+      path << url
+      path.join('')
+    end
+
+    # The output is something like
+    # ["Timor-Leste", "TL"], ["Turkmenistan", "TM"], ["Tunisia", "TN"], ["Tonga", "TO"], .......
+    def self.countries_list_with_name_and_code
+      Carmen::Country.all.map { |t| [t.name, t.alpha_2_code] }
+    end
+
+    def self.countries_without_shipping_zone
+      Nimbleshop::Util.countries_list_with_name_and_code.reject { |_, t| CountryShippingZone.all_country_codes.include?(t) }
+    end
+
+    def self.disabled_shipping_zone_countries
+      countries_with_shipping_zone.reduce([]) { |result, element| result << [element[0], element[1], {disabled: :disabled}]}
+    end
+
+    def self.unconfigured_shipping_zone_countries
+      (Nimbleshop::Util.disabled_shipping_zone_countries + Nimbleshop::Util.countries_without_shipping_zone).sort
+    end
+
+    def self.countries_with_shipping_zone
+      Nimbleshop::Util.countries_list_with_name_and_code.select { |_, t| CountryShippingZone.all_country_codes.include?(t)}
+    end
+
+  end
+end

data/lib/nimbleshop/processor/base.rb

@@ -1,4 +1,11 @@
-module Processor
+module Processor #:nodoc:
+  # = Processor
+  #
+  # Processor class is responsible for payment processing transactions using gateway. This is an abstract
+  # class in the sense that implementations of processors should sublass Processor class.
+  #
+  # It defines five methods: authorize, kapture, purchase, void and refund .
+  # These methods in turn invoke methods do_authorize, do_kapture, do_purchase, do_void, do_refund.
   class Base
 
     extend ActiveModel::Callbacks
@@ -41,7 +48,7 @@ module Processor
       end
     end
 
-    # this method can be overriden by individual payment method
+    # this method can be overriden by individual payment processor
     def set_active_merchant_mode
       mode = Rails.env.production? ? :production : :test
       ActiveMerchant::Billing::Base.mode = mode

data/lib/nimbleshop/sampledata/data.rb

@@ -124,11 +124,14 @@ module Sampledata
       desc = %q{
         Chronograph sport watch from Guess
 
-        Chronograph: Stopwatch function, 24 Hour/Intl. time
-        43/43/13 
+        Stopwatch function, 24 Hour/International time
+
         Brushed + Polished Ionic Black case
+
         Red + Black dial
-        Brushed + Polished Ionic Black Steel bracelet 
+
+        Brushed + Polished Ionic Black Steel bracelet
+
         100 M/330 FT Water resistant
       }
       product = Product.create!( title: "chronograph sport watch from Guess", price: 219, description: desc)
@@ -139,13 +142,11 @@ module Sampledata
     def load_turquoise_bracelet
       print '.'
       desc = %q{
-        Simple, modern, stylish, easy to wear bracelet ! 
-
-        For a scale reference please see the photos with the bracelet worn.
+        Simple, modern, stylish, easy to wear bracelet !
 
         For a custom color bracelet send me a message and I will see what colors are available for your bracelet.
 
-        The strap of the bracelet can also be customized in any color you would like. 
+        The strap of the bracelet can also be customized in any color you would like.
 
         All items come to you beautifully packaged and ready for gift giving.
 
@@ -200,9 +201,9 @@ module Sampledata
     def load_shoes
       print '.'
       desc = %q{
-        People of India love color. Everything they use from top to bottom is colorful.
+        The shoes that you see in picture are called 'jutti' in India.
 
-        Lets talk about shoes. Making good looking shoes is an art they have perfected over centuries. Making a shoe takes the whole village. And the whole village participates in the business of making and selling quality colorful shoes.
+        They are usually made of fine leather and are delicately embroidered with threads or beads. Juttis are slip-on in style and are characterized by rising high in the back and covering the toes with a round heavily-embroidered upper shoe and leaving the top of the foot nearly bare.
       }
       product = Product.create!( title: "Colorful shoes", price: 191, description: desc)
       handle_pictures_for_product(product, "product7")
@@ -232,10 +233,11 @@ module Sampledata
     def load_iphone_cover
       print '.'
       desc = %q{
-        This is a hard case is for your iPhone 4. Fits both AT&T & Verizon models of the iPhone 4. The case has a wood like appearance. 
-        It is not actual wood. It will protect it from scractches while also bringing it to life with some color! 
+        This is a hard case is for your iPhone 4. Fits both AT&T & Verizon models of the iPhone 4.
+
+        The case has a wood like appearance. It is not actual wood. It will protect it from scractches while also bringing it to life with some color!
 
-        It does not interfere with any buttons. It is available in many different colors. If you have a specific color in my then contact me.
+        It does not interfere with any buttons. It is available in many different colors. If you have a specific color in mind then contact me.
       }
       product = Product.create!( title: "Hard wood case for iphone", price: 7.95, description: desc)
       handle_pictures_for_product(product, "product9")