spree 0.10.2 → 0.11.0

data/public/javascripts/admin/checkouts/edit.js

@@ -41,11 +41,17 @@ jQuery(document).ready(function(){
   }
 
   $("#customer_search").autocomplete("/admin/users.json", {
+    minChars: 5,
+    delay: 1500,
     parse: prep_autocomplete_data,
     formatItem: function(item) {
       return format_autocomplete(item);
     }
   }).result(function(event, data, formatted) {
+    $('#user_id').val(data['id']);
+    $('#guest_checkout_true').removeAttr("checked");
+    $('#guest_checkout_false').attr("checked", "checked");
+    $('#guest_checkout_false').removeAttr("disabled");
     $('#checkout_email').val(data['email']);
 
     var addr = data['bill_address'];
@@ -80,6 +86,33 @@ jQuery(document).ready(function(){
     show_billing(!this.checked);
   });
 
+  $('#guest_checkout_true').change(function() {
+    $('#customer_search').val("");
+    $('#user_id').val("");
+    $('#checkout_email').val("");
+    $('#guest_checkout_false').attr("disabled", "true");
+
+    $('#checkout_bill_address_attributes_firstname').val("");
+    $('#checkout_bill_address_attributes_lastname').val("");
+    $('#checkout_bill_address_attributes_address1').val("");
+    $('#checkout_bill_address_attributes_address2').val("");
+    $('#checkout_bill_address_attributes_city').val("");
+    $('#checkout_bill_address_attributes_zipcode').val("");
+    $('#checkout_bill_address_attributes_state_id').val("");
+    $('#checkout_bill_address_attributes_country_id').val("");
+    $('#checkout_bill_address_attributes_phone').val("");
+
+    $('#checkout_ship_address_attributes_firstname').val("");
+    $('#checkout_ship_address_attributes_lastname').val("");
+    $('#checkout_ship_address_attributes_address1').val("");
+    $('#checkout_ship_address_attributes_address2').val("");
+    $('#checkout_ship_address_attributes_city').val("");
+    $('#checkout_ship_address_attributes_zipcode').val("");
+    $('#checkout_ship_address_attributes_state_id').val("");
+    $('#checkout_ship_address_attributes_country_id').val("");
+    $('#checkout_ship_address_attributes_phone').val("");
+  });
+
   var show_billing = function(show) {
     if(show) {
       $('#shipping').show();

data/public/javascripts/dashboard.js

@@ -64,7 +64,7 @@ jQuery(document).ready(function(){
 					fontSize: '10pt',
 					textColor: '#476D9B'
 				},
-				min: 1
+				min: 0
 			},	
 			xaxis:{	 
 				renderer:$.jqplot.DateAxisRenderer,
@@ -140,4 +140,4 @@ jQuery(document).ready(function(){
 	});
 
 
-});
+});

data/public/javascripts/taxonomy.js

@@ -48,7 +48,7 @@ var handle_created = function(id,result) {
 }
 
 var handle_rename = function(li, tree, rb) {
-  var name = jQuery(li).children().text();
+  var name = jQuery(li).children(":first").text();
   name = jQuery.trim(name);
 
   if (creating){
@@ -193,4 +193,4 @@ jQuery(document).ready(function(){
         e.preventDefault();
     }
   });
-});
+});

data/public/stylesheets/admin/admin-tables.css

@@ -16,6 +16,10 @@ table.index th {
     border-bottom:1px solid #ddd;
     padding: 3px 10px;
   }
+  table.index td.lbl-col {
+    width: 12%; }
+   table.index td.val-col {
+    width: 38%; }
 table.index tr.alt td {
   background-color: #efefef; }
 table.index.green th {

data/public/stylesheets/admin/admin.css

@@ -34,8 +34,20 @@ p.help-text {
 
 
 body {
-  background-color: #162F54;
+	margin-top: 0px;
+	  /*background: #ffffff;*/
+  /*background-color: #162F54;*/
   color: #476D9B; }
+.tile_bg_img{
+width:100%;
+		 background: #ffffff url(../../images/tile-slider.png) top left repeat-x;
+}
+.admin_header_bg{
+	width:100%;
+
+height:95px;
+	background:url(../../images/tile-header.png) top left repeat-x;
+}
   a {
     color: #4884BD; }
     a:active,
@@ -75,6 +87,9 @@ body {
           #sidebar h3 a {
             color: #111;
             text-decoration: none; }
+        #sidebar h5 {
+          margin: 0 10px;
+           float: left;}
         #sidebar span.sku {
           display: block;
           font-weight: normal; }
@@ -129,14 +144,14 @@ body {
             color: #fff; }
   h1.logo {
     float: left;
-    margin: 20px 10px 10px 10px;   }
+    margin: 10px 10px 10px 10px;   }
     h1.logo a {
       background: url(../../images/admin/bg/spree_50.png) left center no-repeat;
-      padding-left: 120px;
+      padding-left: 190px;
       display: block;
-      height: 50px;
+      height: 82px;
       text-decoration: none;
-      line-height: 50px;
+      line-height: 82px;
       color: #BBDAFD; }
   #admin-menu { clear: both; }
   #admin-menu,
@@ -520,26 +535,26 @@ div.product-preview-products {
 /* Product Groups */
 
 table#product_scopes tr {
-	background-color: #eee;
-	
+  background-color: #eee;
+
 }
 table#product_scopes tr td {
-	border-top: 4px solid #fff;
-	border-bottom: 1px solid #bbb;
-	padding: 5px 10px;
+  border-top: 4px solid #fff;
+  border-bottom: 1px solid #bbb;
+  padding: 5px 10px;
 }
 table#product_scopes tr td.actions {
   vertical-align: middle;
   text-align: right;
 }
 table#product_scopes tr td table {
-	margin: 0;
-	width: auto;
+  margin: 0;
+  width: auto;
 }
 table#product_scopes tr td table tr td {
-	padding: 0;
-	border:  none;
-	padding-right: 5px;
+  padding: 0;
+  border:  none;
+  padding-right: 5px;
 }
 
 #product_group_forms_container {
@@ -548,7 +563,7 @@ table#product_scopes tr td table tr td {
 #new_product_group_form {
   position: absolute;
   right: 25px;
-  bottom: 0;  
+  bottom: 0;
 }
 #new_product_group_form p {
   text-align: right;

data/public/stylesheets/screen.css

@@ -259,8 +259,8 @@ legend {
   border-right: 1px solid #eeeeee;
 }
 body {
-  margin-top: 10px;
-  background: #ffffff url(../images/body-back.png) top left repeat-x;
+  margin-top: 0px;
+  background: #ffffff url(../images/tile-slider.png) top left repeat-x;
 }
 div.left {
   float: left;
@@ -283,6 +283,12 @@ body.two-col #wrapper { background-image: url(../images/wrapper-back-2.png); }
   overflow: hidden;
   display: block;
 }
+
+.container_bg{
+	width:100%;
+	background:url(../images/tile-header.png) top left repeat-x;
+}
+
 #sidebar {
   display: inline;
   float: left;
@@ -309,7 +315,7 @@ body.two-col #content {
   clear: both;
 }
 #header a { color: #2e6ab1; }
-#header a:hover { color: #eeeeee; }
+#header a:hover { color: #3C7DFB; }
 #footer {
   padding-top: 2em;
   clear: both;
@@ -1179,3 +1185,10 @@ div#checkout #payment-methods li.last {
   float: left;
   width: 190px;
 }
+div#checkout #checkout-summary {
+  background-color: #c3c9df;
+  float: right;
+  margin-top: 10px;
+  padding: 20px;
+  width: 180px;
+}

data/script/about

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/about'
+require File.expand_path('../../config/boot',  __FILE__)
+$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
+require 'commands/about'

data/script/console

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/console'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/console'

data/script/cucumber

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end

data/script/dbconsole

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/dbconsole'

data/script/destroy

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/destroy'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/destroy'

data/script/generate

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/generate'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/generate'

data/script/performance/benchmarker

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/benchmarker'

data/script/performance/profiler

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/profiler'

data/script/plugin

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/plugin'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/plugin'

data/script/runner

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/runner'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/runner'

data/script/server

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/server'
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/server'

data/test/fixtures/payment_methods.yml

@@ -16,3 +16,15 @@ check_payment_method:
   environment: test
   active: false
   type: PaymentMethod::Check
+check_payment_method_cucumber:
+  name: Check Payment Type
+  description: Check Payment Type for test.
+  environment: cucumber
+  active: true
+  type: PaymentMethod::Check
+bogus_cucumber:
+  name: Bogus Test
+  description: Bogus payment gateway for test.
+  environment: cucumber
+  active: true
+  type: Gateway::Bogus

data/test/functional/admin/checkouts_controller_test.rb

@@ -55,7 +55,6 @@ class Admin::CheckoutsControllerTest < ActionController::TestCase
 
       should "render address details" do
         assert_select "table" do
-          assert_select "th", :text => I18n.t("billing_address")
           assert_select "input[id='checkout_bill_address_attributes_firstname'][value=?]", @checkout.bill_address.firstname
           assert_select "input[id='checkout_bill_address_attributes_lastname'][value=?]", @checkout.bill_address.lastname
           assert_select "input[id='checkout_bill_address_attributes_address1'][value=?]", @checkout.bill_address.address1
@@ -69,7 +68,6 @@ class Admin::CheckoutsControllerTest < ActionController::TestCase
         end
 
         assert_select "table" do
-          assert_select "th", :text => I18n.t("shipping_address")
           assert_select "input[id='checkout_ship_address_attributes_firstname'][value=?]", @checkout.ship_address.firstname
           assert_select "input[id='checkout_ship_address_attributes_lastname'][value=?]", @checkout.ship_address.lastname
           assert_select "input[id='checkout_ship_address_attributes_address1'][value=?]", @checkout.ship_address.address1

data/test/functional/admin/line_items_controller_test.rb

@@ -10,7 +10,7 @@ class Admin::LineItemsControllerTest < ActionController::TestCase
       @order.shipment.reload
       @variant = Factory(:variant)
     end
-
+  
     context "on POST to :create" do
       setup do
         post :create, {
@@ -20,33 +20,32 @@ class Admin::LineItemsControllerTest < ActionController::TestCase
         }
         @order.reload
       end
-
+  
       should_assign_to :order
-      should_assign_to :line_item
       should_respond_with :success
-
+  
       should_change("Order.line_items.size", :by => 1) { @order.line_items.size }
-
+  
       should_change("@order.total", :by => (19.99 * 3)) { @order.item_total.to_f }
-
+  
       should "render a form" do
         assert_select "form[id='edit_order_#{@order.id}']" do
           @order.reload.line_items.each do |line_item|
             assert_select "tr[id='line_item_#{line_item.id}']"
           end
-
+  
         end
       end
-
+  
     end
-
+  
     context "with existing line_item" do
       setup do
         @line_item = Factory(:line_item, :variant => @variant, :order => @order, :price => 19.99, :quantity => 3)
         @order.line_items.reload
         @order.update_totals
       end
-
+  
       context "on POST to :create" do
         setup do
           post :create, {
@@ -56,59 +55,59 @@ class Admin::LineItemsControllerTest < ActionController::TestCase
           }
           @order.reload
         end
-
+  
         should_assign_to :order
         should_respond_with :success
-
+  
         should_not_change("Order.line_items.size") { @order.line_items.size }
-
+  
         should_change("@order.line_items.total", :by => (19.99 * 3)) { @order.line_items.total.to_f }
         should_change("@order.total", :by => (19.99 * 3)) { @order.item_total.to_f }
-
+  
         should "render a form" do
           assert_select "form[id='edit_order_#{@order.id}']" do
             @order.reload.line_items.each do |line_item|
               assert_select "tr[id='line_item_#{line_item.id}']"
             end
-
+  
           end
         end
-
+  
       end
-
+  
       context "on PUT to :update with quantity = 2" do
         setup do
-
           put :update, {
             "id" => @line_item.id,
             "order_id" => @order.number,
             "line_item" => {
               "quantity" => 2}
           }
-
+  
           @order.line_items.reload
           @order.update_totals
+          @order.reload
         end
-
+  
         should_assign_to :order
         should_assign_to :line_item
         should_respond_with :success
-
+  
         should_not_change("Order.line_items.size") { @order.line_items.size }
-
+  
         should_change("@order.line_items.total", :to => (19.99 * 2)) { @order.line_items.total.to_f }
         should_change("@order.total", :to => (19.99 * 2)) { @order.total.to_f }
-
+  
         should "render a form" do
           assert_select "form[id='edit_order_#{@order.id}']" do
             @order.reload.line_items.each do |line_item|
               assert_select "tr[id='line_item_#{line_item.id}']"
             end
-
+  
           end
         end
       end
-
+  
       context "on PUT to :update with quantity = 0" do
         setup do
           put :update, {
@@ -117,61 +116,101 @@ class Admin::LineItemsControllerTest < ActionController::TestCase
             "line_item" => {
               "quantity" => 0}
           }
-
+  
           @order.line_items.reload
           @order.update_totals
         end
-
+  
         should_assign_to :order
         should_assign_to :line_item
         should_respond_with :success
-
+  
         should_change("Order.line_items.size", :by => -1) { @order.line_items.size }
-
+  
         should_change("@order.line_items.total", :by => (19.99 * -3)) { @order.line_items.total.to_f }
         should_change("@order.total", :by => (19.99 * -3)) { @order.total.to_f }
-
+  
         should "render a form" do
           assert_select "form[id='edit_order_#{@order.id}']" do
             @order.reload.line_items.each do |line_item|
               assert_select "tr[id='line_item_#{line_item.id}']"
             end
-
+  
           end
         end
       end
-
+  
       context "on DELETE to :destroy" do
         setup do
           delete :destroy, {
             "id" => @line_item.id,
             "order_id" => @order.number
           }
-
+  
           @order.line_items.reload
           @order.update_totals
-
+  
           should_assign_to :order
           should_assign_to :line_item
           should_respond_with :success
-
+  
           should_change("Order.line_items.size", :by => -1) { @order.line_items.size }
-
+  
           should_change("@order.line_items.total", :by => (19.99 * -3)) { @order.line_items.total.to_f }
           should_change("@order.total", :by => (19.99 * -3)) { @order.total.to_f }
-
+  
           should "render a form" do
             assert_select "form[id='edit_order_#{@order.id}']" do
               @order.reload.line_items.each do |line_item|
                 assert_select "tr[id='line_item_#{line_item.id}']"
               end
-
+  
             end
           end
         end
       end
-
+  
+    end
+  
+  end
+  
+  context "given a paid order" do
+    setup do
+      #Spree::Config.set(:auto_capture => true)
+      UserSession.create(Factory(:admin_user))
+      @variant = Factory(:variant)
+      create_paid_order
+      @order.reload
     end
+    context "with existing line_item" do
+      setup do
+        @order.line_items.destroy_all
+        @order.adjustments.destroy_all
+        @line_item = Factory(:line_item, :variant => @variant, :order => @order, :price => 10.00, :quantity => 1)
+        @order.payments.first.update_attribute(:amount, 10.00)
+        @order.line_items.reload
+        @order.update_totals
+      end
+      context "on PUT to :update with quantity = 4" do
+        setup do
+          put :update, {
+            "id" => @line_item.id,
+            "order_id" => @order.number,
+            "line_item" => {
+              "quantity" => 2}
+          }
 
+          @order.line_items.reload
+          @order.reload
+        end
+        should "update the order total" do
+          assert_equal 20.0, @order.total.to_f
+        end
+        should "change order state to balance_due" do
+          assert @order.balance_due?
+        end
+      end
+    end
   end
+  
 end