Merge remote-tracking branch 'OpensourcePOS/master' into bugfix-migration-on-new-install-fails

This commit is contained in:
Travis Garrison
2026-07-30 15:22:25 +04:00

View File

@@ -1095,7 +1095,7 @@ class Sale extends Model
SUM(CASE WHEN payments.cash_adjustment = 1 THEN payments.payment_amount ELSE 0 END) AS sale_cash_adjustment,
SUM(payments.cash_refund) AS sale_cash_refund,
GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type,
GROUP_CONCAT(NULLIF(payments.reference_code, '') SEPARATOR ", ") AS reference_code
GROUP_CONCAT(NULLIF(payments.reference_code, "") SEPARATOR ", ") AS reference_code
FROM ' . $this->db->prefixTable('sales_payments') . ' AS payments
INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
ON sales.sale_id = payments.sale_id