nimbleshop_core 0.0.12 → 0.0.13

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

@@ -1,12 +1,8 @@
 window.Nimbleshop = window.Nimbleshop || {}
 
-Nimbleshop.managePaymentMethods = class ManagePaymentMethods
+Nimbleshop.editPaymentMethod = class EditPaymentMethod
   constructor: ->
-    @editPaymentForm()
-    @selectFirstPaymentMethod()
-
-  editPaymentForm: ->
-    $('[data-behavior~=payment-method-edit-link]').on 'click', ->
+    $(document).on 'click', '[data-behavior~=payment-method-edit-link]', ->
       $this = $(this)
       permalink = $this.data('payment-method-permalink')
       console.log permalink
@@ -14,9 +10,12 @@ Nimbleshop.managePaymentMethods = class ManagePaymentMethods
       contentElem.parent().children().hide()
       contentElem.show()
 
-  selectFirstPaymentMethod: ->
-    $('[data-behavior~=payment-method-edit-link]:first').trigger('click')
+new Nimbleshop.editPaymentMethod
+
 
+Nimbleshop.selectFirstPaymentMethod = class SelectFirstPaymentMethod
+  constructor: ->
+    $('[data-behavior~=payment-method-edit-link]:first').trigger('click')
 
 $ ->
-  new Nimbleshop.managePaymentMethods
+  new Nimbleshop.selectFirstPaymentMethod

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

@@ -0,0 +1,10 @@
+window.Nimbleshop = window.Nimbleshop || {}
+
+Nimbleshop.deletePicture = class DeletePicture
+  constructor: ->
+    $(document).on 'click', '[data-behavior~=delete-product-picture]', ->
+      $("#delete_picture_" + $(this).attr("data-action-id")).trigger "click"
+      $(this).parent().parent().hide "fast"
+      false
+
+new Nimbleshop.deletePicture

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

@@ -0,0 +1,4 @@
+
+$ ->
+  # work around the nested form ugliness
+  $("form input:file").parents('.fields').hide()

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

@@ -0,0 +1,15 @@
+window.Nimbleshop = window.Nimbleshop || {}
+
+Nimbleshop.sortPicture = class SortPicture
+  constructor: ->
+    $(".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.sortPicture

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

@@ -1,10 +1,21 @@
-$ ->
-  $('[data-behavior~=ship-items]').on 'click', ->
+window.Nimbleshop = window.Nimbleshop || {}
+
+Nimbleshop.shipItems = class ShipItems
+  constructor: ->
+  $(document).on 'click', '[data-behavior~=ship-items]', ->
     $(this).hide()
     $('[data-behavior~=ship-items-box]').show()
     false
 
-  $('[data-behavior~=ship-items-cancel]').on 'click', ->
-    $('[data-behavior~=ship-items]').show()
-    $('[data-behavior~=ship-items-box]').hide()
-    false
+
+new Nimbleshop.shipItems
+
+
+Nimbleshop.cancelShipItems = class CancelShipItems
+  constructor: ->
+    $(document).on 'click', '[data-behavior~=ship-items-cancel]', ->
+      $('[data-behavior~=ship-items]').show()
+      $('[data-behavior~=ship-items-box]').hide()
+      false
+
+new Nimbleshop.cancelShipItems

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

@@ -1,6 +1,5 @@
 # this fuction handles anytime shipping cost is changed for a state.
 # Also when shipment is enabled or disabled for a state.
-$ ->
-  $(".update-shipping").live "ajax:success", (t, result) ->
-    $(t.target).parents("tr").replaceWith result.html
+$(document).on 'ajax:success', '.update-shipping', (event, result) ->
+  $(event.target).parents("tr").replaceWith result.html
 

data/app/assets/javascripts/admin.js

@@ -19,7 +19,7 @@
 //= require admin/product-group-condition
 //= require admin/shipit
 //= require admin/shipping_methods/edit
-//= require admin/products/edit
+//= require_tree ./admin/products
 //= require admin/utils/fadeout_success
 //= require autoresize
 

data/app/assets/stylesheets/admin_custom.css

@@ -110,3 +110,11 @@ footer .content a {
 .disable-payment-method-link {
   float: right;
 }
+
+.page-header h1 {
+  color: #ccc;
+}
+
+h1.ns-page-title {
+  color: #ccc;
+}

data/app/controllers/admin/custom_fields_controller.rb

@@ -14,7 +14,7 @@ class Admin::CustomFieldsController < AdminController
   end
 
   def update
-    if @custom_field.update_attributes(params[:custom_field])
+    if @custom_field.update_attributes params[:custom_field]
       redirect_to admin_custom_fields_path, notice: t(:successfully_updated)
     else
       respond_with @custom_field
@@ -27,7 +27,7 @@ class Admin::CustomFieldsController < AdminController
   end
 
   def create
-    @custom_field  = CustomField.new(params[:custom_field])
+    @custom_field  = CustomField.new params[:custom_field]
     if @custom_field.save
       redirect_to admin_custom_fields_url, notice: t(:successfully_added)
     else
@@ -50,7 +50,7 @@ class Admin::CustomFieldsController < AdminController
   private
 
   def load_custom_field
-    @custom_field = CustomField.find(params[:id])
+    @custom_field = CustomField.find params[:id]
   end
 
 end

data/app/controllers/admin/link_groups_controller.rb

@@ -21,15 +21,13 @@ class Admin::LinkGroupsController < AdminController
   def create
     respond_to do |format|
       format.html do
-
-        @link_group = LinkGroup.new(post_params[:link_group])
+        @link_group = LinkGroup.new post_params[:link_group]
 
         if @link_group.save
           redirect_to admin_link_groups_url, notice: t(:successfully_added)
         else
           render action: 'new'
         end
-
       end
     end
   end
@@ -37,13 +35,11 @@ class Admin::LinkGroupsController < AdminController
   def update
     respond_to do |format|
       format.html do
-
-        if @link_group.update_attributes(post_params[:link_group])
+        if @link_group.update_attributes post_params[:link_group]
           redirect_to admin_link_groups_path, notice: t(:successfully_updated)
         else
           rener action: 'edit'
         end
-
       end
     end
   end
@@ -51,10 +47,8 @@ class Admin::LinkGroupsController < AdminController
   def destroy
     respond_to do |format|
       format.html do
-
         @link_group.destroy
         redirect_to admin_link_groups_url, notice: t(:successfully_deleted)
-
       end
     end
   end
@@ -70,7 +64,7 @@ class Admin::LinkGroupsController < AdminController
   end
 
   def load_link_group
-    @link_group = LinkGroup.find_by_permalink!(params[:id])
+    @link_group = LinkGroup.find_by_permalink! params[:id]
   end
 
 end

data/app/controllers/admin/navigations_controller.rb

@@ -3,7 +3,7 @@
 #
 class Admin::NavigationsController < AdminController
 
-  before_filter :load_link_group
+  before_filter :load_link_group!
 
   respond_to :html
 
@@ -16,7 +16,7 @@ class Admin::NavigationsController < AdminController
     respond_to do |format|
       format.html do
 
-        @navigation = @link_group.navigations.build(params[:navigation])
+        @navigation = @link_group.navigations.build params[:navigation]
 
         if @navigation.save
           redirect_to [:admin, :link_groups], notice: t(:successfully_added)
@@ -32,7 +32,7 @@ class Admin::NavigationsController < AdminController
     respond_to do |format|
       format.html do
 
-        @navigation = @link_group.navigations.find_by_id!(params[:id])
+        @navigation = @link_group.navigations.find_by_id! params[:id]
         @navigation.destroy
         redirect_to [:admin, :link_groups], notice: t(:successfully_deleted)
 
@@ -42,8 +42,8 @@ class Admin::NavigationsController < AdminController
 
   private
 
-  def load_link_group
-    @link_group = LinkGroup.find_by_permalink!(params[:link_group_id])
+  def load_link_group!
+    @link_group = LinkGroup.find_by_permalink! params[:link_group_id]
   end
 
 end

data/app/controllers/admin/orders_controller.rb

@@ -1,11 +1,12 @@
 class Admin::OrdersController < AdminController
 
+  before_filter :load_order!, except: :index
+
   respond_to :html
 
   def capture_payment
     respond_to do |format|
       format.html do
-        @order = Order.find_by_number! params[:id]
         @order.payment_method.kapture! @order
         redirect_to admin_order_path(@order), notice: "Amount was successfully captured"
       end
@@ -15,7 +16,6 @@ class Admin::OrdersController < AdminController
   def purchase_payment
     respond_to do |format|
       format.html do
-        @order = Order.find_by_number! params[:id]
         @order.purchase!
         redirect_to admin_order_path(@order), notice: "Amount was successfully paid"
       end
@@ -28,8 +28,6 @@ class Admin::OrdersController < AdminController
   end
 
   def show
-    @order = Order.find_by_number! params[:id]
-
     if @order.shipments.any?
       @shipment = @order.shipments.first
     else
@@ -40,4 +38,10 @@ class Admin::OrdersController < AdminController
     respond_with @order
   end
 
+  private
+
+  def load_order!
+    @order = Order.find_by_number! params[:id]
+  end
+
 end

data/app/controllers/admin/payment_methods_controller.rb

@@ -1,6 +1,7 @@
 class Admin::PaymentMethodsController < AdminController
 
   before_filter :load_payment_methods
+  before_filter :load_payment_method, only: [:enable, :disable]
 
   def index
     @disabled_payment_methods = PaymentMethod.disabled.ascending
@@ -16,20 +17,16 @@ class Admin::PaymentMethodsController < AdminController
   end
 
   def enable
-    payment_method = PaymentMethod.find_by_permalink! params[:id]
-    payment_method.update_attributes! enabled: true
-    flash[:notice] = "Payment method #{payment_method.name} has been enabled"
+    @payment_method.update_attributes! enabled: true
     respond_to do |format|
-      format.html { redirect_to  action: :index }
+      format.html { redirect_to  action: :index, notice: "Payment method #{@payment_method.name} has been enabled" }
     end
   end
 
   def disable
-    payment_method = PaymentMethod.find_by_permalink! params[:id]
-    payment_method.update_attributes! enabled: false
-    flash[:notice] = "Payment method #{payment_method.name} has been disabled"
+    @payment_method.update_attributes! enabled: false
     respond_to do |format|
-      format.html { redirect_to  action: :index }
+      format.html { redirect_to  action: :index, notic: "Payment method #{@payment_method.name} has been disabled" }
     end
   end
 
@@ -39,4 +36,8 @@ class Admin::PaymentMethodsController < AdminController
     @payment_methods = PaymentMethod.enabled.ascending
   end
 
+  def load_payment_method
+    @payment_method = PaymentMethod.find_by_permalink! params[:id]
+  end
+
 end

data/app/controllers/admin/product_groups_controller.rb

@@ -38,13 +38,11 @@ class Admin::ProductGroupsController < AdminController
   def update
     respond_to do |format|
       format.html do
-
-        if @product_group.update_attributes(post_params[:product_group])
+        if @product_group.update_attributes post_params[:product_group]
           redirect_to admin_product_groups_path, notice: t(:successfully_updated)
         else
           render action: 'edit'
         end
-
       end
     end
   end

data/app/controllers/admin/products_controller.rb

@@ -26,14 +26,12 @@ class Admin::ProductsController < AdminController
   def create
     respond_to do |format|
       format.html do
-
         @product = Product.new(post_params[:product])
         if @product.save
           redirect_to edit_admin_product_path(@product), notice: t(:successfully_added)
         else
           render action: 'new'
         end
-
       end
     end
   end
@@ -41,14 +39,12 @@ class Admin::ProductsController < AdminController
   def update
     respond_to do |format|
       format.html do
-
         @product_groups = ProductGroup.contains_product(@product)
         if @product.update_attributes(post_params[:product])
           redirect_to edit_admin_product_path(@product), notice: t(:successfully_updated)
         else
           respond_with @product
         end
-
       end
     end
   end
@@ -65,7 +61,7 @@ class Admin::ProductsController < AdminController
   end
 
   def load_product!
-    @product = Product.find_by_permalink!(params[:id])
+    @product = Product.find_by_permalink! params[:id]
   end
 
 end

data/app/controllers/admin/shipments_controller.rb

@@ -1,19 +1,24 @@
 class Admin::ShipmentsController < AdminController
 
+  before_filter :load_order!
+
   def create
-    @order = Order.find_by_number!(params[:order_id])
-    @shipment = @order.shipments.build(params[:shipment])
+    @shipment = @order.shipments.build params[:shipment]
 
     respond_to do |format|
       format.html do
-
         if @shipment.save
           @order.shipped
           redirect_to admin_order_path(@order)
         end
-
       end
     end
   end
 
+  private
+
+  def load_order!
+    @order = Order.find_by_number! params[:order_id]
+  end
+
 end

data/app/controllers/admin/shipping_methods_controller.rb

@@ -73,11 +73,11 @@ class Admin::ShippingMethodsController < AdminController
   private
 
   def load_shipping_method
-    @shipping_method = @shipping_zone.shipping_methods.find_by_id!(params[:id])
+    @shipping_method = @shipping_zone.shipping_methods.find_by_id! params[:id]
   end
 
   def load_shipping_zone
-    @shipping_zone = ShippingZone.find_by_permalink!(shipping_zone_param)
+    @shipping_zone = ShippingZone.find_by_permalink! shipping_zone_param
   end
 
   def shipping_zone_param

data/app/controllers/admin/shipping_zones_controller.rb

@@ -1,6 +1,6 @@
 class Admin::ShippingZonesController < AdminController
 
-  before_filter :load_shipping_zone, only: [:edit, :update, :destroy]
+  before_filter :load_shipping_zone!, only: [:edit, :update, :destroy]
 
   respond_to :html
 
@@ -19,7 +19,7 @@ class Admin::ShippingZonesController < AdminController
   end
 
   def update
-    if @shipping_zone.update_attributes(post_params[:shipping_zone])
+    if @shipping_zone.update_attributes post_params[:shipping_zone]
       redirect_to admin_shipping_zones_path, notice: t(:successfully_updated)
     else
       respond_with @shipping_zone
@@ -27,7 +27,7 @@ class Admin::ShippingZonesController < AdminController
   end
 
   def create
-    @shipping_zone = CountryShippingZone.new(post_params[:shipping_zone])
+    @shipping_zone = CountryShippingZone.new post_params[:shipping_zone]
     if @shipping_zone.save
       redirect_to admin_shipping_zones_path, notice: t(:successfully_created)
     else
@@ -55,8 +55,8 @@ class Admin::ShippingZonesController < AdminController
     params.permit(shipping_zone: [ :name, :country_code, :state_code, :country_shipping_zone_id])
   end
 
-  def load_shipping_zone
-    @shipping_zone = ShippingZone.find_by_permalink!(params[:id])
+  def load_shipping_zone!
+    @shipping_zone = ShippingZone.find_by_permalink! params[:id]
   end
 
 end

data/app/models/creditcard.rb

@@ -50,7 +50,7 @@ class Creditcard
     options[:year]    = year
     options[:month]   = month
     options[:number]  = number
-    options[:type]    = cardtype
+    options[:brand]    = cardtype
     options[:verification_value]  = verification_value
   end
 

data/config/routes.rb

@@ -1,7 +1,5 @@
 Rails.application.routes.draw do
 
-  root to: 'nimbleshop_simply/products#index'
-
   get '/admin',           to: 'admin/main#index'
 
   # Ideally it should only be included in development mode
@@ -56,9 +54,8 @@ Rails.application.routes.draw do
   end
 
   mount NimbleshopAuthorizedotnet::Engine, at: '/nimbleshop_authorizedotnet'
+  mount NimbleshopStripe::Engine,          at: '/nimbleshop_stripe'
   mount NimbleshopPaypalwp::Engine,        at: '/nimbleshop_paypalwp'
   mount NimbleshopSplitable::Engine,       at: '/nimbleshop_splitable'
   mount NimbleshopCod::Engine,             at: '/nimbleshop_cod'
-  mount NimbleshopSimply::Engine,          at: '/'
-
 end

data/db/migrate/20111022144421_create_initial_tables.rb

@@ -182,7 +182,6 @@ class CreateInitialTables < ActiveRecord::Migration
       t.string   "status",                                    :default => "active", :null => false
       t.text     "description"
       t.decimal  "price",       :precision => 8, :scale => 2,                       :null => false
-      t.boolean  "new",                                       :default => false,    :null => false
       t.string   "permalink",                                                       :null => false
       t.datetime "created_at",                                                      :null => false
       t.datetime "updated_at",                                                      :null => false

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

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

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

@@ -24,9 +24,11 @@ common:
     secret_access_key: <%= ENV['S3_SECRET_ACCESS_KEY'] %>
     bucket_name:       <%= ENV['S3_BUCKET_NAME'] %>
 
-  mailtrapio:
+  mailtrap:
     username: <%= ENV['MAILTRAPIO_USERNAME'] || 'nimbleshop' %>
     password: <%= ENV['MAILTRAPIO_PASSWORD'] || 'f42c2934fbc2e229' %>
+    address:  mailtrap.railsware.com
+    port:     2525
 
 development:
   use_s3: false

data/lib/nimbleshop/core_ext/force_ssl.rb

@@ -11,12 +11,12 @@ module ActionController
 
     module ClassMethods
       def force_ssl(options = {})
-        host = options.delete(:host)
+        host = options.delete :host
         before_filter(options) do
           if !request.ssl?# && !Rails.env.development?
-            redirect_options = {:protocol => 'https://', :status => :moved_permanently}
-            redirect_options.merge!(:host => host) if host
-            redirect_options.merge!(:params => request.query_parameters)
+            redirect_options = {protocol: 'https://', status: :moved_permanently}
+            redirect_options.merge! host: host if host
+            redirect_options.merge! params: request.query_parameters
             redirect_to redirect_options
           end
         end

data/lib/nimbleshop/version.rb

@@ -2,7 +2,7 @@ module Nimbleshop
   class Version
     @major = 0
     @minor = 0
-    @tiny  = 12
+    @tiny  = 13
     @build = nil
 
     class << self

data/lib/tasks/setup.rake

@@ -9,8 +9,11 @@ namespace :nimbleshop do
 
       Rake::Task["db:seed"].invoke
 
+      theme_klass_name = 'NimbleshopSimply'
+
       puts "Loading sample data ..."
-      Sampledata::Data.new.populate
+      cmd = "#{theme_klass_name.underscore}:populate_sample_data"
+      Rake::Task[cmd].invoke
 
       puts "Loading paymen records ..."
       Rake::Task["nimbleshop_splitable:load_record"].invoke

data/test/integration/admin/link_groups_acceptance_test.rb

@@ -7,7 +7,7 @@ class LinkGroupsAcceptanceTest < ActionDispatch::IntegrationTest
     @link_group    = create :link_group,    name: "Branded Shoes"
   end
 
-  test "add a new link group" do
+  test "adding a new link group" do
     visit admin_path
     click_link 'Link groups'
     click_link 'add_new_link_group'
@@ -17,7 +17,7 @@ class LinkGroupsAcceptanceTest < ActionDispatch::IntegrationTest
     assert page.has_content?('Popular products')
   end
 
-  test "add new link" do
+  test "adding a new link" do
     visit admin_path
     click_link 'Link groups'
     refute page.has_content?('Nike Shoes')
@@ -27,7 +27,7 @@ class LinkGroupsAcceptanceTest < ActionDispatch::IntegrationTest
     assert page.has_content?('Nike Shoes')
   end
 
-  test "delete link group" do
+  test "deleting link group" do
     nav = @link_group.navigations.create(product_group: @product_group)
     Capybara.current_driver =  :selenium
     visit admin_link_groups_path

data/test/integration/admin/orders_acceptance_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class OrdersAcceptanceTest <  ActionDispatch::IntegrationTest
 
-  test "paid using splitable" do
+  test "paying using splitable" do
     order = create(:order_paid_using_splitable, payment_status: 'purchased')
 
     visit admin_path
@@ -12,7 +12,7 @@ class OrdersAcceptanceTest <  ActionDispatch::IntegrationTest
     assert page.has_content?('Splitable')
   end
 
-  test "paid using paypalwp" do
+  test "paying using paypalwp" do
     order = create(:order_paid_using_paypalwp, payment_status: 'purchased')
 
     visit admin_path
@@ -22,7 +22,7 @@ class OrdersAcceptanceTest <  ActionDispatch::IntegrationTest
     assert page.has_content?('Paypal website payments standard')
   end
 
-  test "paid using authorize.net" do
+  test "paying using authorize.net" do
     order = create(:order_paid_using_authorizedotnet, payment_status: 'authorized')
 
     visit admin_path
@@ -33,7 +33,7 @@ class OrdersAcceptanceTest <  ActionDispatch::IntegrationTest
     assert page.has_content?('Payment status AUTHORIZED')
   end
 
-  test "payment status abandoned" do
+  test "default payment status should be abandoned" do
     order = build :order, email: nil, shipping_address: nil, shipping_method: nil
     order.save(validate: false)
 
@@ -45,7 +45,7 @@ class OrdersAcceptanceTest <  ActionDispatch::IntegrationTest
     assert page.has_content?('Payment status ABANDONED')
   end
 
-  test "show order with line item and product is deleted" do
+  test "even if product is deleted order with line item should come up" do
     order = build :order, email: nil, shipping_address: nil, shipping_method: nil
     order.save(validate: false)