diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index f572663171..4308381a9d 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -33,8 +33,6 @@ module Spree token_resource - attr_reader :coupon_code - if Spree.user_class belongs_to :user, class_name: Spree.user_class.to_s belongs_to :created_by, class_name: Spree.user_class.to_s @@ -461,7 +459,6 @@ module Spree def finalize! touch :completed_at - # lock all adjustments (coupon promotions, etc.) adjustments.update_all state: 'closed' # update payment and shipment(s) states, and save @@ -605,24 +602,6 @@ module Spree end end - def coupon_code=(code) - @coupon_code = code.strip.downcase rescue nil - end - - # Tells us if there if the specified promotion is already associated with the order - # regardless of whether or not its currently eligible. Useful because generally - # you would only want a promotion action to apply to order no more than once. - # - # Receives an adjustment +originator+ (here a PromotionAction object) and tells - # if the order has adjustments from that already - def promotion_credit_exists?(originator) - !! adjustments.includes(:originator).promotion.reload.detect { |credit| credit.originator.id == originator.id } - end - - def promo_total - adjustments.eligible.promotion.map(&:amount).sum - end - def shipped? %w(partial shipped).include?(shipment_state) end diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 566e579e88..afbd6998a9 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -504,22 +504,6 @@ describe Spree::Order do end end - context "promotion adjustments" do - let(:originator) { double("Originator", id: 1) } - let(:adjustment) { double("Adjustment", originator: originator) } - - before { order.stub_chain(:adjustments, :includes, :promotion, reload: [adjustment]) } - - context "order has an adjustment from given promo action" do - it { expect(order.promotion_credit_exists? originator).to be_true } - end - - context "order has no adjustment from given promo action" do - before { originator.stub(id: 12) } - it { expect(order.promotion_credit_exists? originator).to be_true } - end - end - context "payment required?" do let(:order) { Spree::Order.new }