tienda 1.1.2 → 2.0.1

data/app/views/tienda/variants/form.html.haml

@@ -1,66 +1,107 @@
 - @page_title = "#{t('tienda.variants.variants')} - #{@product.name}"
-= content_for :header do
-  %p.buttons= link_to t('tienda.variants.back_to_variants'), [@product, :variants], :class => 'button'
-  %h2.products= t('tienda.variants.variants_of', product:@product.name)
+
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.variants.variants_of', product:@product.name)
+      -# %small Lorem ipsum dolor
+/ /. ROW
+.row
+  .col-md-12
+    %p.pull-right
+      = link_to t('tienda.variants.back_to_variants'), [@product, :variants], class: 'btn btn-default'
 
 = form_for [@product, @variant], :url => @variant.new_record? ? product_variants_path(@product) : product_variant_path(@product, @variant), :html => {:multipart => true} do |f|
   = f.error_messages
-  = field_set_tag t('tienda.variants.product_information') do
-    .splitContainer
-      %dl.third
-        %dt= f.label :name, t('tienda.variants.name')
-        %dd= f.text_field :name, :class => 'text focus'
-      %dl.third
-        %dt= f.label :permalink, t('tienda.variants.permalink')
-        %dd= f.text_field :permalink, :class => 'text'
-      %dl.third
-        %dt= f.label :sku, t('tienda.variants.sku')
-        %dd= f.text_field :sku, :class => 'text'
+  .panel.panel-default
+    .panel-heading
+      = t('tienda.variants.product_information')
+    .panel-body
+      .row
+        .col-md-4
+          .form-group
+            = f.label :name, t('tienda.variants.name')
+            = f.text_field :name, class: 'form-control focus'
+        .col-md-4
+          .form-group
+            = f.label :permalink, t('tienda.variants.permalink')
+            = f.text_field :permalink, class: 'form-control'
+        .col-md-4
+          .form-group
+            = f.label :sku, t('tienda.variants.sku')
+            = f.text_field :sku, class: 'form-control'
+
+  .panel.panel-default
+    .panel-heading
+      = t('tienda.variants.image')
+    .panel-body
+      .row
+        .col-md-12
+          .form-group
+            = attachment_preview @variant.default_image, hide_if_blank: true
+            = f.file_field :default_image_file, class: 'form-control'
 
-  = field_set_tag t('tienda.variants.image') do
-    %dl
-      %dd
-        = attachment_preview @variant.default_image, :hide_if_blank => true
-        %p= f.file_field :default_image_file
-  = field_set_tag t("tienda.variants.pricing") do
-    .splitContainer
-      %dl.third
-        %dt= f.label :price, t('tienda.variants.price')
-        %dd= f.text_field :price, :class => 'text'
-      %dl.third
-        %dt= f.label :cost_price, t('tienda.variants.cost_price')
-        %dd= f.text_field :cost_price, :class => 'text'
-      %dl.third
-        %dt= f.label :tax_rate_id, t('tienda.variants.tax_rate')
-        %dd= f.collection_select :tax_rate_id, Tienda::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => t('tienda.variants.no_tax')}}
+  .panel.panel-default
+    .panel-heading
+      = t("tienda.variants.pricing")
+    .panel-body
+      .row
+        .col-md-4
+          .form-group
+            = f.label :price, t('tienda.variants.price')
+            .form-group.input-group
+              %span.input-group-addon= Tienda.settings.currency_unit.html_safe
+              = f.text_field :price, class: 'form-control'
+        .col-md-4
+          .form-group
+            = f.label :cost_price, t('tienda.variants.cost_price')
+            .form-group.input-group
+              %span.input-group-addon= Tienda.settings.currency_unit.html_safe
+              = f.text_field :cost_price, class: 'form-control'
+        .col-md-4
+          .form-group
+            = f.label :tax_rate_id, t('tienda.variants.tax_rate')
+            = f.collection_select :tax_rate_id, Tienda::TaxRate.ordered, :id, :description, {include_blank: true}, {class: 'form-control', data: {placeholder: t('tienda.variants.no_tax')}}
 
-  = field_set_tag t('tienda.variants.stock_control') do
-    .splitContainer
-      %dl.half
-        %dt= f.label :weight, t('tienda.variants.weight')
-        %dd= f.text_field :weight, :class => 'text'
+  .panel.panel-default
+    .panel-heading
+      = t('tienda.variants.stock_control')
+    .panel-body
+      .row
+        .col-md-6
+          .form-group
+            = f.label :weight, t('tienda.variants.weight')
+            = f.text_field :weight, class: 'form-control'
 
-      %dl.half
-        %dt= f.label :stock_control, t('tienda.variants.stock_control')
-        %dd.checkbox
-          = f.check_box :stock_control
-          = f.label :stock_control, t('tienda.variants.enable_stock_control?')
+        .col-md-6
+          .form-group
+            = f.label :stock_control, t('tienda.variants.stock_control')
+            .checkbox
+              %label
+                = f.check_box :stock_control
+                = t('tienda.variants.enable_stock_control?')
 
-  = field_set_tag t('tienda.variants.website_properties') do
-    .splitContainer
-      %dl.half
-        %dt= f.label :active, t('tienda.variants.on_sale?')
-        %dd.checkbox
-          = f.check_box :active
-          = f.label :active, t('tienda.variants.on_sale_info')
-      %dl.half
-        %dt= f.label :default, t('tienda.variants.default_variant?')
-        %dd.checkbox
-          = f.check_box :default
-          = f.label :default, t('tienda.variants.default_variant_info')
+  .panel.panel-default
+    .panel-heading
+      = t('tienda.variants.website_properties')
+    .panel-body
+      .row
+        .col-md-6
+          = f.label :active, t('tienda.variants.on_sale?')
+          .checkbox
+            %label
+              = f.check_box :active
+              = t('tienda.variants.on_sale_info')
+        .col-md-6
+          = f.label :default, t('tienda.variants.default_variant?')
+          .checkbox
+            %label
+              = f.check_box :default
+              = t('tienda.variants.default_variant_info')
 
-  %p.submit
-    - unless @variant.new_record?
-      %span.right= link_to t('tienda.delete'), product_variant_path(@product, @variant), :class => 'button purple', :method => :delete, :data => {:confirm => t('tienda.variants.delete_confirmation')}
-    = f.submit t('tienda.variants.save_variant'), :class => 'button green'
-    = link_to t('tienda.cancel'), :products, :class => 'button'
+  .panel.panel-default
+    .panel-body
+      - unless @variant.new_record?
+        %span.right= link_to t('tienda.delete'), product_variant_path(@product, @variant), class: 'btn btn-danger', method: :delete, data: {confirm: t('tienda.variants.delete_confirmation')}
+      = f.submit t('tienda.variants.save_variant'), class: 'btn btn-primary'
+      = link_to t('tienda.cancel'), :products, class: 'btn btn-default'

data/app/views/tienda/variants/index.html.haml

@@ -1,33 +1,51 @@
 - @page_title = "#{t('tienda.variants.variants')} - #{@product.name}"
 
-= content_for :header do
-  %p.buttons
-    = link_to t('tienda.variants.edit_product'), [:edit, @product], :class => 'button'
-    = link_to t('tienda.variants.new_variant'), [:new, @product, :variant], :class => 'button green'
+.row
+  .col-md-12
+    %h1.page-header
+      = t('tienda.variants.variants_of', product: @product.name)
+      -# %small Lorem ipsum dolor
+/ /. ROW
+.row
+  .col-md-12
+    %p.pull-right
+      = link_to t('tienda.variants.edit_product'), [:edit, @product], class: 'btn btn-default'
+      = link_to t('tienda.variants.new_variant'), [:new, @product, :variant], class: 'btn btn-primary'
 
-  %h2.products= t('tienda.variants.variants_of', product: @product.name)
+.panel.panel-default
+  .panel-heading
+    Listing delivery services
+  .panel-body
+    %table.table.table-hover
+      %thead
+        %tr
+          %th{width: '20%'}= t('tienda.variants.sku')
+          %th{width: '50%'}= t('tienda.variants.name')
+          %th{width: '15%'}= t('tienda.variants.price')
+          %th{width: '15%'}= t('tienda.variants.stock')
+      %tbody
+        - if @variants.empty?
+          %tr.empty
+            %td{colspan: 4}= t('tienda.variants.no_products')
+        - else
+          - for variant in @variants
+            %tr
+              %td= variant.sku
+              %td= link_to variant.name, edit_product_variant_path(@product, variant)
+              %td= number_to_currency variant.price
+              %td
+                - if variant.stock_control?
+                  %span.float-right= link_to t('tienda.edit'), stock_level_adjustments_path(item_type: variant.class, item_id: variant.id), class: 'btn btn-default btn-sm', rel: 'dialog', data: {toggle: 'modal', target: '#stockModal'}
+                  %span.label{class: "#{variant.in_stock? ? 'label-default' : 'label-danger'}"}
+                    = boolean_tag(variant.in_stock?, nil, true_text: variant.stock, false_text: t('tienda.variants.no_stock'))
+                - else
+                  ∞
 
-.table
-  %table.data
-    %thead
-      %tr
-        %th{:width => '20%'}= t('tienda.variants.sku')
-        %th{:width => '50%'}= t('tienda.variants.name')
-        %th{:width => '15%'}= t('tienda.variants.price')
-        %th{:width => '15%'}= t('tienda.variants.stock')
-    %tbody
-      - if @variants.empty?
-        %tr.empty
-          %td{:colspan => 4}= t('tienda.variants.no_products')
-      - else
-        - for variant in @variants
-          %tr
-            %td= variant.sku
-            %td= link_to variant.name, edit_product_variant_path(@product, variant)
-            %td= number_to_currency variant.price
-            %td
-              - if variant.stock_control?
-                %span.float-right= link_to t('tienda.edit'), stock_level_adjustments_path(:item_type => variant.class, :item_id => variant.id), :class => 'edit', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
-                = boolean_tag(variant.in_stock?, nil, :true_text => variant.stock, :false_text => t('tienda.variants.no_stock'))
-              - else
-                ∞
+/ Modal
+#stockModal.modal.fade{"aria-hidden" => "true", "aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1"}
+  .modal-dialog
+    .modal-content
+
+    / /.modal-content
+  / /.modal-dialog
+/ /.modal

data/config/initializers/assets.rb

@@ -0,0 +1,9 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+Rails.application.config.assets.precompile += %w( tienda/morris-0.4.3.min.css tienda/custom-styles.css )
+Rails.application.config.assets.precompile += %w( tienda/jquery.metisMenu.js tienda/raphael-2.1.0.min.js tienda/morris.js tienda/custom-scripts.js )

data/config/locales/en.yml

@@ -445,8 +445,8 @@ en:
       website_properties: Website Properties
       weight: Weight
 
-      imports: 
-        help: Products and Categories are matched by name.  If no product is found, a new one will be created with all the attributes on the line.  If a product is found, only the quantity will be updated and all other fields will be ignored.  If no category is found, one with that name will be created .  One product per line.  
+      imports:
+        help: Products and Categories are matched by name.  If no product is found, a new one will be created with all the attributes on the line.  If a product is found, only the quantity will be updated and all other fields will be ignored.  If no category is found, one with that name will be created .  One product per line.
         success: Products imported successfully
         examples:
           first:
@@ -590,6 +590,7 @@ en:
 
     navigation:
       admin_primary:
+        root: Dashboard
         orders: Orders
         products: Products
         product_categories: Product Categories

data/config/routes.rb

@@ -36,7 +36,7 @@ Tienda::Engine.routes.draw do
   get 'login' => 'sessions#new'
   post 'login' => 'sessions#create'
   match 'login/reset' => 'sessions#reset', via: [:get, :post]
-
   delete 'logout' => 'sessions#destroy'
+
   root to: 'dashboard#home'
 end

data/db/migrate/20150517191600_add_stock_counter_cache.rb

@@ -0,0 +1,5 @@
+class AddStockCounterCache < ActiveRecord::Migration
+  def change
+    add_column :tienda_products, :stock_count, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20150517195800_remove_stock_level_item_polymorphism.rb

@@ -0,0 +1,6 @@
+class RemoveStockLevelItemPolymorphism < ActiveRecord::Migration
+  def change
+    rename_column :tienda_stock_level_adjustments, :item_id, :product_id
+    remove_column :tienda_stock_level_adjustments, :item_type
+  end
+end

data/db/migrate/20150517212100_update_stock_counter_cache.rb

@@ -0,0 +1,5 @@
+class UpdateStockCounterCache < ActiveRecord::Migration
+  def change
+    Tienda::StockLevelAdjustment.counter_culture_fix_counts
+  end
+end

data/db/migrate/20150603235417_add_document_to_orders.rb

@@ -0,0 +1,5 @@
+class AddDocumentToOrders < ActiveRecord::Migration
+  def change
+    add_column :tienda_orders, :document, :integer
+  end
+end

data/lib/tienda/default_navigation.rb

@@ -9,12 +9,13 @@ require 'tienda/navigation_manager'
 # This is the default navigation manager for the admin interface.
 #
 Tienda::NavigationManager.build(:admin_primary) do
-  add_item :orders
-  add_item :products
-  add_item :product_categories
-  add_item :delivery_services
-  add_item :tax_rates
-  add_item :users
-  add_item :countries
-  add_item :settings
+  add_item :root, icon: 'fa fa-dashboard'
+  add_item :orders, icon: 'fa fa-money'
+  add_item :products, icon: 'fa fa-barcode'
+  add_item :product_categories, icon: 'fa fa-tags'
+  add_item :delivery_services, icon: 'fa fa-truck'
+  add_item :tax_rates, icon: 'fa fa-calculator'
+  add_item :users, icon: 'fa fa-users'
+  add_item :countries, icon: 'fa fa-flag'
+  add_item :settings, icon: 'fa fa-gear'
 end

data/lib/tienda/navigation_manager.rb

@@ -38,6 +38,7 @@ module Tienda
       item.identifier       = identifier.to_s
       item.url              = options[:url]            if options[:url]
       item.link_options     = options[:link_options]   if options[:link_options]
+      item.icon             = options[:icon]           if options[:icon]
       item.active_if        = block                    if block_given?
       items << item
     end
@@ -47,11 +48,7 @@ module Tienda
     end
 
     class NavigationItem
-      attr_accessor :manager
-      attr_accessor :identifier
-      attr_accessor :url
-      attr_accessor :link_options
-      attr_accessor :active_if
+      attr_accessor :manager, :identifier, :url, :link_options, :active_if, :icon
 
       def description
         I18n.translate("tienda.navigation.#{manager.identifier}.#{identifier}")

data/lib/tienda/version.rb

@@ -1,3 +1,3 @@
 module Tienda
-  VERSION = '1.1.2'
+  VERSION = '2.0.1'
 end

data/lib/tienda.rb

@@ -1,21 +1,17 @@
-require 'coffee-rails'
-require 'sass-rails'
-require 'jquery-rails'
 require 'haml'
 require 'bcrypt'
 require 'dynamic_form'
 require 'kaminari'
 require 'ransack'
+require 'counter_culture'
 
 require 'nifty/utils'
 require 'nifty/key_value_store'
 require 'nifty/attachments'
-require 'nifty/dialog'
 
 module Tienda
   class << self
-
-    # The path to the root of the Tienda applicatinio
+    # The path to the root of the Tienda application
     #
     # @return [String]
     def root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tienda
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Gonzalo Robaina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,48 +138,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +178,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: counter_culture
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.23
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.23
 - !ruby/object:Gem::Dependency
   name: nifty-key-value-store
   requirement: !ruby/object:Gem::Requirement
@@ -274,26 +252,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: nifty-dialog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +336,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: A full Rails engine providing e-commerce functionality for any Rails
   4 application. Based on Shoppe Rails Gem.
 email:
@@ -429,13 +401,20 @@ files:
 - app/assets/images/tienda/table-tear-off.png
 - app/assets/javascripts/tienda/application.coffee
 - app/assets/javascripts/tienda/chosen.jquery.js
+- app/assets/javascripts/tienda/custom-scripts.js
+- app/assets/javascripts/tienda/custom.js
+- app/assets/javascripts/tienda/jquery.metisMenu.js
 - app/assets/javascripts/tienda/jquery_ui.js
+- app/assets/javascripts/tienda/morris.js
 - app/assets/javascripts/tienda/mousetrap.js
 - app/assets/javascripts/tienda/order_form.coffee
+- app/assets/javascripts/tienda/raphael-2.1.0.min.js
 - app/assets/stylesheets/tienda/application.scss
 - app/assets/stylesheets/tienda/chosen.scss
+- app/assets/stylesheets/tienda/custom-styles.scss
 - app/assets/stylesheets/tienda/dialog.scss
 - app/assets/stylesheets/tienda/elements.scss
+- app/assets/stylesheets/tienda/morris-0.4.3.min.css
 - app/assets/stylesheets/tienda/printable.scss
 - app/assets/stylesheets/tienda/reset.scss
 - app/assets/stylesheets/tienda/sub.scss
@@ -482,10 +461,13 @@ files:
 - app/views/layouts/tienda/application.html.haml
 - app/views/layouts/tienda/printable.html.haml
 - app/views/layouts/tienda/sub.html.haml
+- app/views/tienda/application/_navbar.html.haml
+- app/views/tienda/application/_sidebar.html.haml
 - app/views/tienda/countries/_form.html.haml
 - app/views/tienda/countries/edit.html.haml
 - app/views/tienda/countries/index.html.haml
 - app/views/tienda/countries/new.html.haml
+- app/views/tienda/dashboard/home.html.haml
 - app/views/tienda/delivery_service_prices/_form.html.haml
 - app/views/tienda/delivery_service_prices/edit.html.haml
 - app/views/tienda/delivery_service_prices/index.html.haml
@@ -526,6 +508,7 @@ files:
 - app/views/tienda/sessions/reset.html.haml
 - app/views/tienda/settings/edit.html.haml
 - app/views/tienda/shared/error.html.haml
+- app/views/tienda/stock_level_adjustments/_table.html.haml
 - app/views/tienda/stock_level_adjustments/index.html.haml
 - app/views/tienda/tax_rates/form.html.haml
 - app/views/tienda/tax_rates/index.html.haml
@@ -536,12 +519,17 @@ files:
 - app/views/tienda/users/new.html.haml
 - app/views/tienda/variants/form.html.haml
 - app/views/tienda/variants/index.html.haml
+- config/initializers/assets.rb
 - config/locales/en.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/routes.rb
 - db/countries.txt
 - db/migrate/20150124094549_create_tienda_initial_schema.rb
+- db/migrate/20150517191600_add_stock_counter_cache.rb
+- db/migrate/20150517195800_remove_stock_level_item_polymorphism.rb
+- db/migrate/20150517212100_update_stock_counter_cache.rb
+- db/migrate/20150603235417_add_document_to_orders.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg
 - db/seeds_data/snom-870-blk.jpg
@@ -597,8 +585,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Just an e-commerce platform.
 test_files: []
+has_rdoc: