|
|
@@ -517,7 +517,7 @@ class TPlusServerService extends Service
|
|
|
CASE WHEN rp_b.idvouchertype = 20 THEN COALESCE(si_b.quantity, 0) ELSE 0 END as quantity,
|
|
|
CASE WHEN rp_b.idvouchertype = 20 THEN COALESCE(si_b.taxPrice, 0) ELSE 0 END as price_1,
|
|
|
CASE WHEN rp_b.idvouchertype = 20 THEN COALESCE(si_b.taxAmount, 0) ELSE 0 END as price_1_total,
|
|
|
- COALESCE(rp_b.amount, 0) as payment_amount,
|
|
|
+ COALESCE(rp_b.origCurrentAmount, 0) as payment_amount,
|
|
|
COALESCE(rp_b.ID, 0) as id_detail,
|
|
|
COALESCE(rp_b.voucherDetailID, 0) as id_detail_upstream,
|
|
|
COALESCE(rp_b.voucherCode, '') as order_number_upstream,
|
|
|
@@ -525,6 +525,7 @@ class TPlusServerService extends Service
|
|
|
rp_b.idvouchertype as voucher_type
|
|
|
")
|
|
|
->get();
|
|
|
+// COALESCE(rp_b.amount, 0) as payment_amount,
|
|
|
|
|
|
if ($rows->isEmpty()) break;
|
|
|
|
cqp