spree_core 2.3.13 → 2.4.0.rc1

data/lib/spree/testing_support/factories/line_item_factory.rb

@@ -2,8 +2,9 @@ FactoryGirl.define do
   factory :line_item, class: Spree::LineItem do
     quantity 1
     price { BigDecimal.new('10.00') }
+    pre_tax_amount { price }
     order
-    transient do
+    ignore do
       association :product
     end
     variant{ product.master }

data/lib/spree/testing_support/factories/order_factory.rb

@@ -5,9 +5,13 @@ FactoryGirl.define do
     completed_at nil
     email { user.email }
 
+    ignore do
+      line_items_price BigDecimal.new(10)
+    end
+
     factory :order_with_totals do
-      after(:create) do |order|
-        create(:line_item, order: order)
+      after(:create) do |order, evaluator|
+        create(:line_item, order: order, price: evaluator.line_items_price)
         order.line_items.reload # to ensure order.line_items is accessible after
       end
     end
@@ -16,15 +20,16 @@ FactoryGirl.define do
       bill_address
       ship_address
 
-      transient do
-        line_items_count 5
+      ignore do
+        line_items_count 1
+        shipment_cost 100
       end
 
       after(:create) do |order, evaluator|
-        create_list(:line_item, evaluator.line_items_count, order: order)
+        create_list(:line_item, evaluator.line_items_count, order: order, price: evaluator.line_items_price)
         order.line_items.reload
 
-        create(:shipment, order: order)
+        create(:shipment, order: order, cost: evaluator.shipment_cost)
         order.shipments.reload
 
         order.update!

data/lib/spree/testing_support/factories/promotion_category_factory.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :promotion_category, class: Spree::PromotionCategory do
+    name 'Promotion Category'
+  end
+end
+

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     name 'Promo'
 
     trait :with_line_item_adjustment do
-      transient do
+      ignore do
         adjustment_rate 10
       end
 
@@ -16,13 +16,13 @@ FactoryGirl.define do
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
 
     trait :with_order_adjustment do
-      transient do
-        order_adjustment_amount 10
+      ignore do
+        weighted_order_adjustment_amount 10
       end
 
       after(:create) do |promotion, evaluator|
         calculator = Spree::Calculator::FlatRate.new
-        calculator.preferred_amount = evaluator.order_adjustment_amount
+        calculator.preferred_amount = evaluator.weighted_order_adjustment_amount
         action = Spree::Promotion::Actions::CreateAdjustment.create!(:calculator => calculator)
         promotion.actions << action
         promotion.save!
@@ -30,14 +30,16 @@ FactoryGirl.define do
     end
 
     trait :with_item_total_rule do
-      transient do
+      ignore do
         item_total_threshold_amount 10
       end
 
       after(:create) do |promotion, evaluator|
         rule = Spree::Promotion::Rules::ItemTotal.create!(
-          preferred_operator: 'gte',
-          preferred_amount: evaluator.item_total_threshold_amount
+          preferred_operator_min: 'gte',
+          preferred_operator_max: 'lte',
+          preferred_amount_min: evaluator.item_total_threshold_amount,
+          preferred_amount_max: evaluator.item_total_threshold_amount + 100
         )
         promotion.rules << rule
         promotion.save!

data/lib/spree/testing_support/factories/refund_factory.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}"}
+
+  factory :refund, class: Spree::Refund do
+    amount 100.00
+    transaction_id { generate(:refund_transaction_id) }
+    association(:payment, state: 'completed')
+    association(:reason, factory: :refund_reason)
+  end
+
+  factory :refund_reason, class: Spree::RefundReason do
+    sequence(:name) { |n| "Refund for return ##{n}" }
+  end
+end

data/lib/spree/testing_support/factories/reimbursement_factory.rb

@@ -0,0 +1,16 @@
+FactoryGirl.define do
+  factory :reimbursement, class: Spree::Reimbursement do
+    ignore do
+      return_items_count 1
+    end
+
+    customer_return { create(:customer_return_with_accepted_items, line_items_count: return_items_count) }
+
+    before(:create) do |reimbursement, evaluator|
+      reimbursement.order ||= reimbursement.customer_return.order
+      if reimbursement.return_items.empty?
+        reimbursement.return_items = reimbursement.customer_return.return_items
+      end
+    end
+  end
+end

data/lib/spree/testing_support/factories/reimbursement_type_factory.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :reimbursement_type, class: Spree::ReimbursementType do
+    sequence(:name) { |n| "Reimbursement Type #{n}" }
+    active true
+    mutable true
+  end
+end

data/lib/spree/testing_support/factories/return_authorization_factory.rb

@@ -1,12 +1,18 @@
 FactoryGirl.define do
   factory :return_authorization, class: Spree::ReturnAuthorization do
-    amount 100.00
     association(:order, factory: :shipped_order)
-    reason 'no particular reason'
-    state 'received'
+    association(:stock_location, factory: :stock_location)
+    association(:reason, factory: :return_authorization_reason)
+    memo 'Items were broken'
   end
 
   factory :new_return_authorization, class: Spree::ReturnAuthorization do
     association(:order, factory: :shipped_order)
+    association(:stock_location, factory: :stock_location)
+    association(:reason, factory: :return_authorization_reason)
+  end
+
+  factory :return_authorization_reason, class: Spree::ReturnAuthorizationReason do
+    sequence(:name) { |n| "Defect ##{n}" }
   end
 end

data/lib/spree/testing_support/factories/return_item_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :return_item, class: Spree::ReturnItem do
+    association(:inventory_unit, factory: :inventory_unit, state: :shipped)
+    association(:return_authorization, factory: :return_authorization)
+
+    factory :exchange_return_item do
+      association(:exchange_variant, factory: :variant)
+    end
+  end
+end

data/lib/spree/testing_support/factories/shipment_factory.rb

@@ -12,6 +12,7 @@ FactoryGirl.define do
       shipment.order.line_items.each do |line_item|
         line_item.quantity.times do
           shipment.inventory_units.create(
+            order_id: shipment.order_id,
             variant_id: line_item.variant_id,
             line_item_id: line_item.id
           )

data/lib/spree/testing_support/factories/shipping_method_factory.rb

@@ -2,6 +2,7 @@ FactoryGirl.define do
   factory :base_shipping_method, class: Spree::ShippingMethod do
     zones { |a| [Spree::Zone.global] }
     name 'UPS Ground'
+    code 'UPS_GROUND'
 
     before(:create) do |shipping_method, evaluator|
       if shipping_method.shipping_categories.empty?
@@ -10,11 +11,11 @@ FactoryGirl.define do
     end
 
     factory :shipping_method, class: Spree::ShippingMethod do
-      association(:calculator, factory: :shipping_calculator, strategy: :build)
+      association(:calculator, factory: :calculator, strategy: :build)
     end
 
     factory :free_shipping_method, class: Spree::ShippingMethod do
-      association(:calculator, factory: :shipping_no_amount_calculator, strategy: :build)
+      association(:calculator, factory: :no_amount_calculator, strategy: :build)
     end
   end
 end

data/lib/spree/testing_support/factories/stock_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   # must use build()
   factory :stock_packer, class: Spree::Stock::Packer do
-    transient do
+    ignore do
       stock_location { build(:stock_location) }
       contents []
     end
@@ -10,21 +10,22 @@ FactoryGirl.define do
   end
 
   factory :stock_package, class: Spree::Stock::Package do
-    transient do
+    ignore do
       stock_location { build(:stock_location) }
-      order { create(:order_with_line_items, line_items_count: 2) }
-      contents []
+      contents       { [] }
+      variants_contents { {} }
     end
 
-    initialize_with { new(stock_location, order, contents) }
+    initialize_with { new(stock_location, contents) }
 
-    factory :stock_package_fulfilled do
-      after(:build) do |package, evaluator|
-        evaluator.order.line_items.reload
-        evaluator.order.line_items.each do |line_item|
-          package.add line_item, line_item.quantity, :on_hand
-        end
+    after(:build) do |package, evaluator|
+      evaluator.variants_contents.each do |variant, count|
+        package.add_multiple build_list(:inventory_unit, count, variant: variant)
       end
     end
+
+    factory :stock_package_fulfilled do
+      ignore { variants_contents { { build(:variant) => 2 } } }
+    end
   end
 end

data/lib/spree/testing_support/flash.rb

@@ -5,12 +5,12 @@ module Spree
         flash = convert_flash(flash)
 
         within("[class='flash success']") do
-          expect(page).to have_content(flash)
+          page.should have_content(flash)
         end
       end
 
       def assert_successful_update_message(resource)
-        flash = Spree.t(:successfully_updated, resource: Spree.t(resource))
+        flash = Spree.t(:successfully_updated, :resource => Spree.t(resource))
         assert_flash_success(flash)
       end
 

data/lib/tasks/email.rake

@@ -0,0 +1,7 @@
+namespace :email do
+  desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake test:email'
+  task :test => :environment do
+    raise ArgumentError, "Must pass EMAIL environment variable. Example: EMAIL=spree@example.com bundle exec rake test:email" unless ENV['EMAIL'].present?
+    Spree::TestMailer.test_email(ENV['EMAIL']).deliver!
+  end
+end

data/lib/tasks/exchanges.rake

@@ -0,0 +1,70 @@
+namespace :exchanges do
+  desc %q{Takes unreturned exchanged items and creates a new order to charge
+  the customer for not returning them}
+  task charge_unreturned_items: :environment do
+
+    unreturned_return_items =  Spree::ReturnItem.awaiting_return.exchange_processed.joins(:exchange_inventory_unit).where([
+      "spree_inventory_units.created_at < :days_ago",
+      days_ago: Spree::Config[:expedited_exchanges_days_window].days.ago
+    ]).to_a
+
+    # Determine that a return item has already been deemed unreturned and therefore charged
+    # by the fact that its exchange inventory unit has popped off to a different order
+    unreturned_return_items.select! { |ri| ri.inventory_unit.order_id == ri.exchange_inventory_unit.order_id }
+
+    failed_orders = []
+
+    unreturned_return_items.group_by(&:exchange_shipment).each do |shipment, return_items|
+      begin
+        inventory_units = return_items.map(&:exchange_inventory_unit)
+
+        original_order = shipment.order
+        order_attributes = {
+          bill_address: original_order.bill_address,
+          ship_address: original_order.ship_address,
+          email: original_order.email
+        }
+        order_attributes[:store_id] = original_order.store_id
+        order = Spree::Order.create!(order_attributes)
+
+        order.associate_user!(original_order.user) if original_order.user
+
+        return_items.group_by(&:exchange_variant).map do |variant, variant_return_items|
+          variant_inventory_units = variant_return_items.map(&:exchange_inventory_unit)
+          line_item = Spree::LineItem.create!(variant: variant, quantity: variant_return_items.count, order: order)
+          variant_inventory_units.each { |i| i.update_attributes!(line_item_id: line_item.id, order_id: order.id) }
+        end
+
+        order.reload.update!
+        while order.state != order.checkout_steps[-2] && order.next; end
+
+        unless order.payments.present?
+          card_to_reuse = original_order.valid_credit_cards.first
+          card_to_reuse = original_order.user.credit_cards.default.first if !card_to_reuse && original_order.user
+          Spree::Payment.create!(order: order,
+                                 payment_method_id: card_to_reuse.try(:payment_method_id),
+                                 source: card_to_reuse,
+                                 amount: order.total)
+        end
+
+        # the order builds a shipment on its own on transition to delivery, but we want
+        # the original exchange shipment, not the built one
+        order.shipments.destroy_all
+        shipment.update_attributes!(order_id: order.id)
+        order.update_attributes!(state: "confirm")
+
+        order.reload.next!
+        order.update!
+        order.finalize!
+
+        failed_orders << order unless order.completed? && order.valid?
+      rescue
+        failed_orders << order
+      end
+    end
+    failure_message = failed_orders.map { |o| "#{o.number} - #{o.errors.full_messages}" }.join(", ")
+    raise UnableToChargeForUnreturnedItems.new(failure_message) if failed_orders.present?
+  end
+end
+
+class UnableToChargeForUnreturnedItems < StandardError; end

data/vendor/assets/javascripts/jquery.validate/localization/messages_et.js

@@ -0,0 +1,23 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: ET (Estonian; eesti, eesti keel)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "See väli peab olema täidetud.",
+		maxlength: $.validator.format("Palun sisestage vähem kui {0} tähemärki."),
+		minlength: $.validator.format("Palun sisestage vähemalt {0} tähemärki."),
+		rangelength: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1} tähemärki."),
+		email: "Palun sisestage korrektne e-maili aadress.",
+		url: "Palun sisestage korrektne URL.",
+		date: "Palun sisestage korrektne kuupäev.",
+		dateISO: "Palun sisestage korrektne kuupäev (YYYY-MM-DD).",
+		number: "Palun sisestage korrektne number.",
+		digits: "Palun sisestage ainult numbreid.",
+		equalTo: "Palun sisestage sama väärtus uuesti.",
+		range: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1}."),
+		max: $.validator.format("Palun sisestage väärtus, mis on väiksem või võrdne arvuga {0}."),
+		min: $.validator.format("Palun sisestage väärtus, mis on suurem või võrdne arvuga {0}."),
+		creditcard: "Palun sisestage korrektne krediitkaardi number."
+	});
+}(jQuery));

data/vendor/assets/javascripts/jquery.validate/localization/messages_eu.js

@@ -0,0 +1,25 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: EU (Basque; euskara, euskera)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "Eremu hau beharrezkoa da.",
+		remote: "Mesedez, bete eremu hau.",
+		email: "Mesedez, idatzi baliozko posta helbide bat.",
+		url: "Mesedez, idatzi baliozko URL bat.",
+		date: "Mesedez, idatzi baliozko data bat.",
+		dateISO: "Mesedez, idatzi baliozko (ISO) data bat.",
+		number: "Mesedez, idatzi baliozko zenbaki oso bat.",
+		digits: "Mesedez, idatzi digituak soilik.",
+		creditcard: "Mesedez, idatzi baliozko txartel zenbaki bat.",
+		equalTo: "Mesedez, idatzi berdina berriro ere.",
+		accept: "Mesedez, idatzi onartutako luzapena duen balio bat.",
+		maxlength: $.validator.format("Mesedez, ez idatzi {0} karaktere baino gehiago."),
+		minlength: $.validator.format("Mesedez, ez idatzi {0} karaktere baino gutxiago."),
+		rangelength: $.validator.format("Mesedez, idatzi {0} eta {1} karaktere arteko balio bat."),
+		range: $.validator.format("Mesedez, idatzi {0} eta {1} arteko balio bat."),
+		max: $.validator.format("Mesedez, idatzi {0} edo txikiagoa den balio bat."),
+		min: $.validator.format("Mesedez, idatzi {0} edo handiagoa den balio bat.")
+	});
+}(jQuery));

data/vendor/assets/javascripts/jquery.validate/localization/messages_hr.js

@@ -0,0 +1,25 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: HR (Croatia; hrvatski jezik)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "Ovo polje je obavezno.",
+		remote: "Ovo polje treba popraviti.",
+		email: "Unesite ispravnu e-mail adresu.",
+		url: "Unesite ispravan URL.",
+		date: "Unesite ispravan datum.",
+		dateISO: "Unesite ispravan datum (ISO).",
+		number: "Unesite ispravan broj.",
+		digits: "Unesite samo brojeve.",
+		creditcard: "Unesite ispravan broj kreditne kartice.",
+		equalTo: "Unesite ponovo istu vrijednost.",
+		accept: "Unesite vrijednost sa ispravnom ekstenzijom.",
+		maxlength: $.validator.format("Maksimalni broj znakova je {0} ."),
+		minlength: $.validator.format("Minimalni broj znakova je {0} ."),
+		rangelength: $.validator.format("Unesite vrijednost između {0} i {1} znakova."),
+		range: $.validator.format("Unesite vrijednost između {0} i {1}."),
+		max: $.validator.format("Unesite vrijednost manju ili jednaku {0}."),
+		min: $.validator.format("Unesite vrijednost veću ili jednaku {0}.")
+	});
+}(jQuery));

data/vendor/assets/javascripts/jquery.validate/localization/messages_ka.js

@@ -0,0 +1,25 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: KA (Georgian; ქართული)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "ამ ველის შევსება აუცილებელია.",
+		remote: "გთხოვთ მიუთითოთ სწორი მნიშვნელობა.",
+		email: "გთხოვთ მიუთითოთ ელ-ფოსტის კორექტული მისამართი.",
+		url: "გთხოვთ მიუთითოთ კორექტული URL.",
+		date: "გთხოვთ მიუთითოთ კორექტული თარიღი.",
+		dateISO: "გთხოვთ მიუთითოთ კორექტული თარიღი ISO ფორმატში.",
+		number: "გთხოვთ მიუთითოთ ციფრი.",
+		digits: "გთხოვთ მიუთითოთ მხოლოდ ციფრები.",
+		creditcard: "გთხოვთ მიუთითოთ საკრედიტო ბარათის კორექტული ნომერი.",
+		equalTo: "გთხოვთ მიუთითოთ ასეთივე მნიშვნელობა კიდევ ერთხელ.",
+		accept: "გთხოვთ აირჩიოთ ფაილი კორექტული გაფართოებით.",
+		maxlength: $.validator.format("დასაშვებია არაუმეტეს {0} სიმბოლო."),
+		minlength: $.validator.format("აუცილებელია შეიყვანოთ მინიმუმ {0} სიმბოლო."),
+		rangelength: $.validator.format("ტექსტში სიმბოლოების რაოდენობა უნდა იყოს {0}-დან {1}-მდე."),
+		range: $.validator.format("გთხოვთ შეიყვანოთ ციფრი {0}-დან {1}-მდე."),
+		max: $.validator.format("გთხოვთ შეიყვანოთ ციფრი რომელიც ნაკლებია ან უდრის {0}-ს."),
+		min: $.validator.format("გთხოვთ შეიყვანოთ ციფრი რომელიც მეტია ან უდრის {0}-ს.")
+	});
+}(jQuery));