kkt_shoppe 1.1.2 → 1.2.0

data/app/views/layouts/kkt_shoppe/printable.html.haml

@@ -8,4 +8,4 @@
   %body
     #content
       = yield
-      
+      

data/config/locales/de.yml

@@ -387,7 +387,6 @@ de:
       attachments: Anhänge
       back_to_categories: Zurück zu den Kategorien
       category_details: Kategoriedetails
-      choose_product_category: Produktkategorie auswählen
       create_notice: Kategorie wurde erfolgreich erstellt
       delete_confirmation: Möchten Sie diese Kategorie wirklich löschen?
       description: Beschreibung
@@ -401,7 +400,6 @@ de:
       update_notice: Kategorie wurde erfolgreich aktualisiert
 
     products:
-      add_attachments: Anhänge betrachten/hinzufügen
       add_attribute: Attribut hinzufügen
       attachments: Anhänge
       attributes: Attribute
@@ -603,7 +601,6 @@ de:
         users: Benutzer
         countries: Länder
         settings: Einstellungen
-        customers: Kunden
 
     settings:
 

data/config/locales/en.yml

@@ -472,7 +472,6 @@ en:
         hierarchy: Hierarchy
 
     products:
-      add_attachments: View/add attachments
       add_attribute: Add attribute
       attachments: Attachments
       attributes: Attributes

data/config/locales/es.yml

@@ -400,7 +400,6 @@ es:
       update_notice: Categoría actualizada satisfactoriamente
 
     products:
-      add_attachments: Ver/agregar adjuntos
       add_attribute: Agregar atributo
       attachments: Adjuntos
       attributes: Atributos

data/config/locales/pl.yml

@@ -415,7 +415,6 @@ pl:
         hierarchy: Hierarchy
 
     products:
-      add_attachments: Zobacz/dodaj załączniki
       add_attribute: Dodaj atrybut
       attachments: Załączniki
       attributes: Atrybuty

data/config/locales/pt-BR.yml

@@ -288,7 +288,7 @@ pt-BR:
       id: ID
       in_progress_warning: Este pedido ainda está sendo construído pelo cliente na sua loja. No momento você pode apenas ver os itens que estão no pedido.
       invoice_number: Número da fatura
-      insufficient_stock_order: "Estoque insuficiente para pedido de %{out_of_stock_items }. As quantidades foram atualizadas para o total máximo de estoque dispon��vel."
+      insufficient_stock_order: "Estoque insuficiente para pedido de %{out_of_stock_items }. As quantidades foram atualizadas para o total máximo de estoque disponível."
       item: Item
       last_name: Último nome
       mark_as_shipped: Marcar como enviado
@@ -402,7 +402,6 @@ pt-BR:
         hierarchy: Hierarchy
 
     products:
-      add_attachments: Visualizar/adicionar anexos
       add_attribute: Adicionar atributo
       attachments: Anexos
       attributes: Atributos

data/db/migrate/20131024201501_add_address_type_to_kkt_shoppe_tax_rates.rb

@@ -2,4 +2,4 @@ class AddAddressTypeToKktShoppeTaxRates < ActiveRecord::Migration
   def change
     add_column :kkt_shoppe_tax_rates, :address_type, :string
   end
-end
+end

data/db/migrate/20131024204815_create_kkt_shoppe_payments.rb

@@ -29,4 +29,4 @@ class CreateKktShoppePayments < ActiveRecord::Migration
     remove_column :kkt_shoppe_orders, :exported
     remove_column :kkt_shoppe_orders, :invoice_number
   end
-end
+end

data/db/migrate/20131102143930_remove_default_on_order_item_weight.rb

@@ -6,4 +6,4 @@ class RemoveDefaultOnOrderItemWeight < ActiveRecord::Migration
   def down
     change_column_default :kkt_shoppe_order_items, :weight, 0.0
   end
-end
+end

data/db/migrate/20150315215633_add_customer_to_kkt_shoppe_orders.rb

@@ -2,4 +2,4 @@ class AddCustomerToKktShoppeOrders < ActiveRecord::Migration
   def change
     add_column :kkt_shoppe_orders, :customer_id, :integer
   end
-end
+end

data/db/schema.rb

@@ -11,7 +11,20 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150519173350) do
+ActiveRecord::Schema.define(version: 20150315223628) do
+
+  create_table "nifty_attachments", force: true do |t|
+    t.integer  "parent_id"
+    t.string   "parent_type"
+    t.string   "token"
+    t.string   "digest"
+    t.string   "role"
+    t.string   "file_name"
+    t.string   "file_type"
+    t.binary   "data",        limit: 16777215
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "nifty_key_value_store", force: true do |t|
     t.integer "parent_id"
@@ -35,7 +48,7 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.datetime "updated_at"
   end
 
-  add_index "kkt_shoppe_addresses", ["customer_id"], name: "index_kkt_shoppe_addresses_on_customer_id"
+  add_index "kkt_shoppe_addresses", ["customer_id"], name: "index_kkt_shoppe_addresses_on_customer_id", using: :btree
 
   create_table "kkt_shoppe_attachments", force: true do |t|
     t.integer  "parent_id",   null: false
@@ -84,10 +97,10 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.text     "country_ids"
   end
 
-  add_index "kkt_shoppe_delivery_service_prices", ["delivery_service_id"], name: "index_kkt_shoppe_delivery_service_prices_on_delivery_service_id"
-  add_index "kkt_shoppe_delivery_service_prices", ["max_weight"], name: "index_kkt_shoppe_delivery_service_prices_on_max_weight"
-  add_index "kkt_shoppe_delivery_service_prices", ["min_weight"], name: "index_kkt_shoppe_delivery_service_prices_on_min_weight"
-  add_index "kkt_shoppe_delivery_service_prices", ["price"], name: "index_kkt_shoppe_delivery_service_prices_on_price"
+  add_index "kkt_shoppe_delivery_service_prices", ["delivery_service_id"], name: "index_kkt_shoppe_delivery_service_prices_on_delivery_service_id", using: :btree
+  add_index "kkt_shoppe_delivery_service_prices", ["max_weight"], name: "index_kkt_shoppe_delivery_service_prices_on_max_weight", using: :btree
+  add_index "kkt_shoppe_delivery_service_prices", ["min_weight"], name: "index_kkt_shoppe_delivery_service_prices_on_min_weight", using: :btree
+  add_index "kkt_shoppe_delivery_service_prices", ["price"], name: "index_kkt_shoppe_delivery_service_prices_on_price", using: :btree
 
   create_table "kkt_shoppe_delivery_services", force: true do |t|
     t.string   "name"
@@ -100,7 +113,7 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.string   "tracking_url"
   end
 
-  add_index "kkt_shoppe_delivery_services", ["active"], name: "index_kkt_shoppe_delivery_services_on_active"
+  add_index "kkt_shoppe_delivery_services", ["active"], name: "index_kkt_shoppe_delivery_services_on_active", using: :btree
 
   create_table "kkt_shoppe_order_items", force: true do |t|
     t.integer  "order_id"
@@ -116,8 +129,8 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.datetime "updated_at"
   end
 
-  add_index "kkt_shoppe_order_items", ["order_id"], name: "index_kkt_shoppe_order_items_on_order_id"
-  add_index "kkt_shoppe_order_items", ["ordered_item_id", "ordered_item_type"], name: "index_kkt_shoppe_order_items_ordered_item"
+  add_index "kkt_shoppe_order_items", ["order_id"], name: "index_kkt_shoppe_order_items_on_order_id", using: :btree
+  add_index "kkt_shoppe_order_items", ["ordered_item_id", "ordered_item_type"], name: "index_kkt_shoppe_order_items_ordered_item", using: :btree
 
   create_table "kkt_shoppe_orders", force: true do |t|
     t.string   "token"
@@ -164,9 +177,9 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.integer  "customer_id"
   end
 
-  add_index "kkt_shoppe_orders", ["delivery_service_id"], name: "index_kkt_shoppe_orders_on_delivery_service_id"
-  add_index "kkt_shoppe_orders", ["received_at"], name: "index_kkt_shoppe_orders_on_received_at"
-  add_index "kkt_shoppe_orders", ["token"], name: "index_kkt_shoppe_orders_on_token"
+  add_index "kkt_shoppe_orders", ["delivery_service_id"], name: "index_kkt_shoppe_orders_on_delivery_service_id", using: :btree
+  add_index "kkt_shoppe_orders", ["received_at"], name: "index_kkt_shoppe_orders_on_received_at", using: :btree
+  add_index "kkt_shoppe_orders", ["token"], name: "index_kkt_shoppe_orders_on_token", using: :btree
 
   create_table "kkt_shoppe_payments", force: true do |t|
     t.integer  "order_id"
@@ -182,8 +195,8 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.datetime "updated_at"
   end
 
-  add_index "kkt_shoppe_payments", ["order_id"], name: "index_kkt_shoppe_payments_on_order_id"
-  add_index "kkt_shoppe_payments", ["parent_payment_id"], name: "index_kkt_shoppe_payments_on_parent_payment_id"
+  add_index "kkt_shoppe_payments", ["order_id"], name: "index_kkt_shoppe_payments_on_order_id", using: :btree
+  add_index "kkt_shoppe_payments", ["parent_payment_id"], name: "index_kkt_shoppe_payments_on_parent_payment_id", using: :btree
 
   create_table "kkt_shoppe_product_attributes", force: true do |t|
     t.integer  "product_id"
@@ -196,9 +209,9 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.boolean  "public",     default: true
   end
 
-  add_index "kkt_shoppe_product_attributes", ["key"], name: "index_kkt_shoppe_product_attributes_on_key"
-  add_index "kkt_shoppe_product_attributes", ["position"], name: "index_kkt_shoppe_product_attributes_on_position"
-  add_index "kkt_shoppe_product_attributes", ["product_id"], name: "index_kkt_shoppe_product_attributes_on_product_id"
+  add_index "kkt_shoppe_product_attributes", ["key"], name: "index_kkt_shoppe_product_attributes_on_key", using: :btree
+  add_index "kkt_shoppe_product_attributes", ["position"], name: "index_kkt_shoppe_product_attributes_on_position", using: :btree
+  add_index "kkt_shoppe_product_attributes", ["product_id"], name: "index_kkt_shoppe_product_attributes_on_product_id", using: :btree
 
   create_table "kkt_shoppe_product_categories", force: true do |t|
     t.string   "name"
@@ -214,44 +227,17 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.boolean  "permalink_includes_ancestors", default: false
   end
 
-  add_index "kkt_shoppe_product_categories", ["lft"], name: "index_kkt_shoppe_product_categories_on_lft"
-  add_index "kkt_shoppe_product_categories", ["permalink"], name: "index_kkt_shoppe_product_categories_on_permalink"
-  add_index "kkt_shoppe_product_categories", ["rgt"], name: "index_kkt_shoppe_product_categories_on_rgt"
+  add_index "kkt_shoppe_product_categories", ["lft"], name: "index_kkt_shoppe_product_categories_on_lft", using: :btree
+  add_index "kkt_shoppe_product_categories", ["permalink"], name: "index_kkt_shoppe_product_categories_on_permalink", using: :btree
+  add_index "kkt_shoppe_product_categories", ["rgt"], name: "index_kkt_shoppe_product_categories_on_rgt", using: :btree
 
   create_table "kkt_shoppe_product_categorizations", force: true do |t|
     t.integer "product_id",          null: false
     t.integer "product_category_id", null: false
   end
 
-  add_index "kkt_shoppe_product_categorizations", ["product_category_id"], name: "categorization_by_product_category_id"
-  add_index "kkt_shoppe_product_categorizations", ["product_id"], name: "categorization_by_product_id"
-
-  create_table "kkt_shoppe_product_category_translations", force: true do |t|
-    t.integer  "kkt_shoppe_product_category_id", null: false
-    t.string   "locale",                     null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "name"
-    t.string   "permalink"
-    t.text     "description"
-  end
-
-  add_index "kkt_shoppe_product_category_translations", ["locale"], name: "index_kkt_shoppe_product_category_translations_on_locale"
-  add_index "kkt_shoppe_product_category_translations", ["kkt_shoppe_product_category_id"], name: "index_75826cc72f93d014e54dc08b8202892841c670b4"
-
-  create_table "kkt_shoppe_product_translations", force: true do |t|
-    t.integer  "kkt_shoppe_product_id", null: false
-    t.string   "locale",            null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "name"
-    t.string   "permalink"
-    t.text     "description"
-    t.text     "short_description"
-  end
-
-  add_index "kkt_shoppe_product_translations", ["locale"], name: "index_kkt_shoppe_product_translations_on_locale"
-  add_index "kkt_shoppe_product_translations", ["kkt_shoppe_product_id"], name: "index_kkt_shoppe_product_translations_on_kkt_shoppe_product_id"
+  add_index "kkt_shoppe_product_categorizations", ["product_category_id"], name: "categorization_by_product_category_id", using: :btree
+  add_index "kkt_shoppe_product_categorizations", ["product_id"], name: "categorization_by_product_id", using: :btree
 
   create_table "kkt_shoppe_products", force: true do |t|
     t.integer  "parent_id"
@@ -273,9 +259,9 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.boolean  "default",                                   default: false
   end
 
-  add_index "kkt_shoppe_products", ["parent_id"], name: "index_kkt_shoppe_products_on_parent_id"
-  add_index "kkt_shoppe_products", ["permalink"], name: "index_kkt_shoppe_products_on_permalink"
-  add_index "kkt_shoppe_products", ["sku"], name: "index_kkt_shoppe_products_on_sku"
+  add_index "kkt_shoppe_products", ["parent_id"], name: "index_kkt_shoppe_products_on_parent_id", using: :btree
+  add_index "kkt_shoppe_products", ["permalink"], name: "index_kkt_shoppe_products_on_permalink", using: :btree
+  add_index "kkt_shoppe_products", ["sku"], name: "index_kkt_shoppe_products_on_sku", using: :btree
 
   create_table "kkt_shoppe_settings", force: true do |t|
     t.string "key"
@@ -283,7 +269,7 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.string "value_type"
   end
 
-  add_index "kkt_shoppe_settings", ["key"], name: "index_kkt_shoppe_settings_on_key"
+  add_index "kkt_shoppe_settings", ["key"], name: "index_kkt_shoppe_settings_on_key", using: :btree
 
   create_table "kkt_shoppe_stock_level_adjustments", force: true do |t|
     t.integer  "item_id"
@@ -296,8 +282,8 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.datetime "updated_at"
   end
 
-  add_index "kkt_shoppe_stock_level_adjustments", ["item_id", "item_type"], name: "index_kkt_shoppe_stock_level_adjustments_items"
-  add_index "kkt_shoppe_stock_level_adjustments", ["parent_id", "parent_type"], name: "index_kkt_shoppe_stock_level_adjustments_parent"
+  add_index "kkt_shoppe_stock_level_adjustments", ["item_id", "item_type"], name: "index_kkt_shoppe_stock_level_adjustments_items", using: :btree
+  add_index "kkt_shoppe_stock_level_adjustments", ["parent_id", "parent_type"], name: "index_kkt_shoppe_stock_level_adjustments_parent", using: :btree
 
   create_table "kkt_shoppe_tax_rates", force: true do |t|
     t.string   "name"
@@ -317,6 +303,6 @@ ActiveRecord::Schema.define(version: 20150519173350) do
     t.datetime "updated_at"
   end
 
-  add_index "kkt_shoppe_users", ["email_address"], name: "index_kkt_shoppe_users_on_email_address"
+  add_index "kkt_shoppe_users", ["email_address"], name: "index_kkt_shoppe_users_on_email_address", using: :btree
 
 end

data/lib/kkt_shoppe/associated_countries.rb

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

data/lib/kkt_shoppe/engine.rb

@@ -1,12 +1,12 @@
 module KktShoppe
   class Engine < ::Rails::Engine
     isolate_namespace KktShoppe
-
+    
     if KktShoppe.respond_to?(:root)
       config.autoload_paths << File.join(KktShoppe.root, 'lib')
       config.assets.precompile += ['kkt_shoppe/sub.css', 'kkt_shoppe/printable.css']
     end
-
+    
     # We don't want any automatic generators in the engine.
     config.generators do |g|
       g.orm             :active_record
@@ -21,39 +21,35 @@ module KktShoppe
         require_dependency(c)
       end
     end
-
+    
     initializer 'kkt_shoppe.initialize' do |app|
       # Add the default settings
       KktShoppe.add_settings_group :system_settings, [:store_name, :email_address, :currency_unit, :tax_name, :demo_mode]
-
+      
       # Add middleware
       app.config.middleware.use KktShoppe::SettingsLoader
-
+      
       # Load our migrations into the application's db/migrate path
       unless app.root.to_s.match root.to_s
         config.paths["db/migrate"].expanded.each do |expanded_path|
           app.config.paths["db/migrate"] << expanded_path
         end
-      end
-
+      end      
+      
       # Load view helpers for the base application
       ActiveSupport.on_load(:action_view) do
         require 'kkt_shoppe/view_helpers'
         ActionView::Base.send :include, KktShoppe::ViewHelpers
       end
-
-      ActiveSupport.on_load(:active_record) do
-        require 'kkt_shoppe/model_extension'
-        ActiveRecord::Base.send :include, KktShoppe::ModelExtension
-      end
-
+      
       # Load default navigation
       require 'kkt_shoppe/default_navigation'
     end
-
+    
     generators do
       require 'kkt_shoppe/setup_generator'
     end
-
+    
   end
 end
+

data/lib/kkt_shoppe/errors/inappropriate_delivery_service.rb

@@ -3,4 +3,4 @@ module KktShoppe
     class InappropriateDeliveryService < Error
     end
   end
-end
+end

data/lib/kkt_shoppe/errors/insufficient_stock_to_fulfil.rb

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

data/lib/kkt_shoppe/errors/invalid_configuration.rb

@@ -3,4 +3,4 @@ module KktShoppe
     class InvalidConfiguration < Error
     end
   end
-end
+end

data/lib/kkt_shoppe/errors/not_enough_stock.rb

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

data/lib/kkt_shoppe/errors/payment_declined.rb

@@ -3,4 +3,4 @@ module KktShoppe
     class PaymentDeclined < KktShoppe::Error
     end
   end
-end
+end

data/lib/kkt_shoppe/errors/refund_failed.rb

@@ -3,4 +3,4 @@ module KktShoppe
     class RefundFailed < Error
     end
   end
-end
+end

data/lib/kkt_shoppe/errors/unorderable_item.rb

@@ -3,4 +3,4 @@ module KktShoppe
     class UnorderableItem < Error
     end
   end
-end
+end

data/lib/kkt_shoppe/version.rb

@@ -1,3 +1,3 @@
 module KktShoppe
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/lib/kkt_shoppe.rb

@@ -10,8 +10,8 @@ require "globalize"
 
 require 'nifty/utils'
 require 'nifty/key_value_store'
+require 'nifty/attachments'
 require 'nifty/dialog'
-require 'carrierwave'
 
 module KktShoppe
   class << self

data/lib/tasks/{kylekthompson_shoppe.rake → kkt_shoppe.rake}

@@ -26,4 +26,4 @@ namespace :kkt_shoppe do
     Rake::Task["kkt_shoppe:create_default_user"].invoke if KktShoppe::User.all.empty?
   end
   
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kkt_shoppe
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Kyle Thompson, Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -521,8 +521,6 @@ files:
 - app/models/kkt_shoppe/stock_level_adjustment.rb
 - app/models/kkt_shoppe/tax_rate.rb
 - app/models/kkt_shoppe/user.rb
-- app/models/shoppe/attachment.rb
-- app/uploaders/shoppe/attachment_uploader.rb
 - app/validators/permalink_validator.rb
 - app/views/kkt_shoppe/addresses/_form.html.haml
 - app/views/kkt_shoppe/addresses/edit.html.haml
@@ -621,7 +619,6 @@ files:
 - db/migrate/20141026181718_add_nested_to_product_categories.rb
 - db/migrate/20141027215005_create_kkt_shoppe_addresses.rb
 - db/migrate/20150315215633_add_customer_to_kkt_shoppe_orders.rb
-- db/migrate/20150315223628_create_kkt_shoppe_attachments.rb
 - db/migrate/20150513171350_create_kkt_shoppe_product_category_translation_table.rb
 - db/migrate/20150519173350_create_kkt_shoppe_product_translation_table.rb
 - db/schema.rb
@@ -652,7 +649,6 @@ files:
 - lib/kkt_shoppe/errors/payment_declined.rb
 - lib/kkt_shoppe/errors/refund_failed.rb
 - lib/kkt_shoppe/errors/unorderable_item.rb
-- lib/kkt_shoppe/model_extension.rb
 - lib/kkt_shoppe/navigation_manager.rb
 - lib/kkt_shoppe/orderable_item.rb
 - lib/kkt_shoppe/settings.rb
@@ -660,9 +656,8 @@ files:
 - lib/kkt_shoppe/setup_generator.rb
 - lib/kkt_shoppe/version.rb
 - lib/kkt_shoppe/view_helpers.rb
-- lib/shoppe/model_extension.rb
-- lib/tasks/kylekthompson_shoppe.rake
-homepage: http://tryshoppe.com
+- lib/tasks/kkt_shoppe.rake
+homepage: http://www.kylekthompson.com
 licenses:
 - MIT
 metadata: {}