Code

Vouchers part 1#11002

Code

Merged

Matt-Yorkley merged 16 commits intomasteropenfoodfoundation/openfoodnetwork:masterfrom voucher-prepopenfoodfoundation/openfoodnetwork:voucher-prepCopy head branch name to clipboardJun 28, 2023

+89-72

Commits

Commits on Jun 13, 2023

• Remove angular loading element in darkwarm layout

  Matt-Yorkley

  committed
  bf912ae

  Copy full SHA for bf912ae

• Move tax charge logic out of checkout controller and update payment transition

  Matt-Yorkley

  committed
  074eb4b

  Copy full SHA for 074eb4b

Commits on Jun 14, 2023

• Tidy up checkout tax spec

  Matt-Yorkley

  committed
  a0d0f8f

  Copy full SHA for a0d0f8f

• Reorder callback definitions

  Matt-Yorkley

  committed
  65b6a75

  Copy full SHA for 65b6a75

• Move taxing of admin adjustments out of customer details controller

  Matt-Yorkley

  committed
  13a22c5

  Copy full SHA for 13a22c5

• Extract before_payment_state? method

  Matt-Yorkley

  committed
  a0f23fc

  Copy full SHA for a0f23fc

• Reapply taxes at model level if order address changes

  Show description for c5dfecb
  Matt-Yorkley

  committed
  c5dfecb

  Copy full SHA for c5dfecb

• Don't try to cancel shipments that might already be cancelled

  Matt-Yorkley

  committed
  06c9697

  Copy full SHA for 06c9697

• Reload order after cancelling it in tests that check shipment states

  Matt-Yorkley

  committed
  837e581

  Copy full SHA for 837e581

• Don't tax fees before payment state

  Matt-Yorkley

  committed
  6fa3811

  Copy full SHA for 6fa3811

• Update adjustment spec to use orders past delivery state

  Matt-Yorkley

  committed
  ef09492

  Copy full SHA for ef09492

• Fix test setup in BOM spec

  Matt-Yorkley

  committed
  11382a5

  Copy full SHA for 11382a5

• Fix Rubocop complaint

  Matt-Yorkley

  committed
  52806a3

  Copy full SHA for 52806a3

• Use order total excluding discounts in voucher calculations

  Matt-Yorkley

  committed
  93df70c

  Copy full SHA for 93df70c

• Improve voucher #calculate tests

  Matt-Yorkley

  committed
  1a744de

  Copy full SHA for 1a744de

• Remove voucher processing from checkout edit action

  Matt-Yorkley

  committed
  202b004

  Copy full SHA for 202b004