Skip to content

Commit 1967940

Browse files
committed
Fix split sort order
1 parent a0b6b11 commit 1967940

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

app/graphql/mutations/transaction_split.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class TransactionSplit < BaseMutation
1414
def resolve(id:, splits:, total_amount_cents: nil, date: nil)
1515
transaction = Transaction.find(id)
1616

17-
expected_total_cents = total_amount_cents || (transaction.shop_amount_cents || transaction.amount_cents)
17+
expected_total_cents = total_amount_cents || transaction.shop_amount_cents || transaction.amount_cents
1818

1919
if splits.sum { |split| split.amount_cents } != expected_total_cents
2020
raise GraphqlErrors::ValidationError, "Transaction amounts do not match"

app/graphql/types/transaction_type.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,9 @@ def shop_amount(currency_id: nil)
3535

3636
ExchangeRates::ConvertMoney.new([object.shop_amount], to_currency: Currency.find(currency_id)).call.sum
3737
end
38+
39+
def split_to
40+
object.split_to.left_outer_joins(:category).order("categories.sort_order ASC", amount_cents: :asc, shop: :asc)
41+
end
3842
end
3943
end

0 commit comments

Comments
 (0)