Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vouchers part 1 #11002

Merged
merged 16 commits into from
Jun 28, 2023
Merged

Vouchers part 1 #11002

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bf912ae
Remove angular loading element in darkwarm layout
Matt-Yorkley Jun 1, 2023
074eb4b
Move tax charge logic out of checkout controller and update payment t…
Matt-Yorkley Jun 2, 2023
a0d0f8f
Tidy up checkout tax spec
Matt-Yorkley Jun 2, 2023
65b6a75
Reorder callback definitions
Matt-Yorkley Jun 2, 2023
13a22c5
Move taxing of admin adjustments out of customer details controller
Matt-Yorkley Jun 2, 2023
a0f23fc
Extract before_payment_state? method
Matt-Yorkley Jun 13, 2023
c5dfecb
Reapply taxes at model level if order address changes
Matt-Yorkley Jun 2, 2023
06c9697
Don't try to cancel shipments that might already be cancelled
Matt-Yorkley Jun 2, 2023
837e581
Reload order after cancelling it in tests that check shipment states
Matt-Yorkley Jun 8, 2023
6fa3811
Don't tax fees before payment state
Matt-Yorkley Jun 2, 2023
ef09492
Update adjustment spec to use orders past delivery state
Matt-Yorkley Jun 2, 2023
11382a5
Fix test setup in BOM spec
Matt-Yorkley Jun 5, 2023
52806a3
Fix Rubocop complaint
Matt-Yorkley Jun 13, 2023
93df70c
Use order total excluding discounts in voucher calculations
Matt-Yorkley Jun 13, 2023
1a744de
Improve voucher #calculate tests
Matt-Yorkley Jun 13, 2023
202b004
Remove voucher processing from checkout edit action
Matt-Yorkley Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions app/models/spree/order.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,6 @@ def states
delegate :create_line_item_fees!, :create_order_fees!, :update_order_fees!,
:update_line_item_fees!, :recreate_all_fees!, to: :fee_handler

# Needs to happen before save_permalink is called
before_validation :set_currency
before_validation :generate_order_number, if: :new_record?
before_validation :clone_billing_address, if: :use_billing?
before_validation :ensure_customer

before_create :link_by_email
after_create :create_tax_charge!

validates :customer, presence: true, if: :require_customer?
validate :products_available_from_new_distribution, if: lambda {
distributor_id_changed? || order_cycle_id_changed?
Expand All @@ -107,16 +98,24 @@ def states
validates :order_cycle, presence: true, on: :require_distribution
validates :distributor, presence: true, on: :require_distribution

make_permalink field: :number
before_validation :set_currency
before_validation :generate_order_number, if: :new_record?
before_validation :clone_billing_address, if: :use_billing?
before_validation :ensure_customer
dacook marked this conversation as resolved.
Show resolved Hide resolved

before_create :link_by_email
before_save :update_shipping_fees!, if: :complete?
before_save :update_payment_fees!, if: :complete?

after_create :create_tax_charge!

after_save_commit DefaultAddressUpdater

make_permalink field: :number

attribute :send_cancellation_email, type: :boolean, default: true
attribute :restock_items, type: :boolean, default: true
# -- Scopes

scope :not_empty, -> {
left_outer_joins(:line_items).where.not(spree_line_items: { id: nil })
}
Expand Down