This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| group :assets do | |
| gem 'sass-rails', '~> 3.1.0' | |
| gem 'coffee-rails', '~> 3.1.0' | |
| gem 'uglifier' | |
| gem 'compass', '~> 0.12.alpha' | |
| # include other compass plugins here. E.g.: | |
| gem 'compass-susy-plugin', :require => 'susy' | |
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #storeNav | |
| float: left | |
| padding-top: 10px | |
| padding-left: 240px | |
| ul | |
| +horizontal-list(1em) | |
| li | |
| a | |
| font-size: 16px | |
| text-decoration: none |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /home/jet/.rvm/gems/ruby-1.9.3-p0@spree-1.2-stable/bundler/gems/spree_flexi_variants-76686d3c763c/app/models/spree/order_decorator.rb:48:in `block in contains?' | |
| activerecord (3.2.8) lib/active_record/associations/collection_proxy.rb:89:in `each' | |
| activerecord (3.2.8) lib/active_record/associations/collection_proxy.rb:89:in `detect' | |
| activerecord (3.2.8) lib/active_record/associations/collection_proxy.rb:89:in `method_missing' | |
| /home/jet/.rvm/gems/ruby-1.9.3-p0@spree-1.2-stable/bundler/gems/spree_flexi_variants-76686d3c763c/app/models/spree/order_decorator.rb:47:in `contains?' | |
| /home/jet/.rvm/gems/ruby-1.9.3-p0@spree-1.2-stable/bundler/gems/spree_flexi_variants-76686d3c763c/app/models/spree/order_decorator.rb:4:in `add_variant' | |
| /home/jet/.rvm/gems/ruby-1.9.3-p0@spree-1.2-stable/bundler/gems/spree-1200d1ab2c0d/core/app/models/spree/order.rb:472:in `block in merge!' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| require "bundler/capistrano" | |
| # Below will speed-up deploy by doing a git diff from last deploy | |
| # set :deploy_via, :remote_cache | |
| set :scm, :git | |
| set :repository, "jet@209.166.65.132:aceleathergoods.git" | |
| set :branch, "origin/dev_ruby-1.9.3-p194" | |
| set :migrate_target, :current | |
| set :ssh_options, { :forward_agent => true } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| nginx.conf | |
| user deployer staff; | |
| worker_processes 2; | |
| error_log /var/log/nginx/error.log; | |
| pid /var/run/nginx.pid; | |
| events { | |
| worker_connections 1024; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| require "bundler/capistrano" | |
| # Below will speed-up deploy by doing a git diff from last deploy | |
| # set :deploy_via, :remote_cache | |
| set :scm, :git | |
| set :repository, "jet@209.166.65.132:aceleathergoods.git" | |
| set :branch, "origin/dev_ruby-1.9.3-p194" | |
| set :migrate_target, :current | |
| set :ssh_options, { :forward_agent => true } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| server { | |
| listen 443 default deferred; ## listen for ipv4 | |
| listen [::]:443 default ipv6only=on; ## listen for ipv6 | |
| server_name aceleathergoods.net; | |
| ssl on; | |
| ssl_certificate /etc/ssl/certs/server.crt; | |
| ssl_certificate_key /etc/ssl/private/server.key; | |
| ssl_session_cache shared:SSL:10m; | |
| server_name aceleathergoods.net ; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -X diff-exclude -Naur spree_flexi_variants_Lilley/app/assets/javascripts/admin/orders/edit.js spree_flexi_variants/app/assets/javascripts/admin/orders/edit.js | |
| --- spree_flexi_variants_Lilley/app/assets/javascripts/admin/orders/edit.js 2013-03-01 08:19:40.000000000 -0800 | |
| +++ spree_flexi_variants/app/assets/javascripts/admin/orders/edit.js 2013-03-01 08:27:48.000000000 -0800 | |
| @@ -13,7 +13,7 @@ | |
| return false; | |
| }); | |
| - $("#add_product_name").product_autocomplete(); | |
| + $(".variant_autocomplete").variantAutocomplete(); | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/core/app/models/spree/adjustment.rb b/core/app/models/spree/adjustment.rb | |
| index 35f90f9..c4f7be0 100644 | |
| --- a/core/app/models/spree/adjustment.rb | |
| +++ b/core/app/models/spree/adjustment.rb | |
| @@ -1,10 +1,8 @@ | |
| # Adjustments represent a change to the +item_total+ of an Order. Each adjustment | |
| # has an +amount+ that can be either positive or negative. | |
| # | |
| -# Adjustments can be open/closed/finalized | |
| -# |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Spree::Order.class_eval do | |
| self.state_machine.after_transition :to => :payment, :do => :lookup_tax_cloud, :if => :tax_cloud_eligible? | |
| def lookup_tax_cloud | |
| unless tax_cloud_transaction.nil? | |
| tax_cloud_transaction.lookup | |
| else | |
| create_tax_cloud_transaction | |
| tax_cloud_transaction.lookup |
OlderNewer