Commit graph

129 commits

Author SHA1 Message Date
fbe43a2cf4 FEAT(pg): sortable columns + date-range filters on the IPG+ admin panel
Make every PaymentRequest changelist column sortable ascending/descending
(computed amount/user/jalali columns get an `ordering` so they sort by the
underlying DB field; only the "check success again" action button stays
unsortable). Add a default `-created_at` ordering and surface `updated_at`
as its own sortable column. The created_at/updated_at DateTimeRangeFilters
are retained and compose with sorting.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-06 13:24:50 +03:30
7fccde4022 Merge pull request 'feature/wallet-refactor' (#5) from feature/wallet-refactor into master
Reviewed-on: #5
2026-08-31 10:22:59 -04:00
b8e7ebb295 REVERT(pg): drop the commission-income wallet deposit
The deposit_income_submit/deposit_income_verify/charge_wallet_income
machinery and income_uuid added in 7dcb730 were not intended. Remove
them and the trailing charge_wallet_income() call.

The wallet charge is back to a single deposit: paid from IPG's own
application wallet (WALLET_IPG_CREDIT) into the user's rial wallet
(WALLET_RIAL_DEPOSIT).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-31 17:44:26 +03:30
e4e13b2235 FIX(pg): deposit user balance from IPG's own wallet, not the user rial wallet
deposit_submit/deposit_verify passed WALLET_RIAL_DEPOSIT (a user-side
wallet type) as the company-side payer wallet. The payer must be IPG's
application wallet, WALLET_IPG_CREDIT; the user's rial wallet stays as
the body payee_wallet. deposit_income_* already used WALLET_IPG_CREDIT
correctly.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-31 17:39:31 +03:30
e6782a037a Merge pull request 'REFACTOR(wallets): rename WALLET_INCOME_FROM_IPG to WALLET_IPG_CREDIT' (#4) from feature/wallet-refactor into master
Reviewed-on: #4
2026-08-31 09:37:26 -04:00
0083f1b092 REFACTOR(wallets): rename WALLET_INCOME_FROM_IPG to WALLET_IPG_CREDIT
Rename the wallet-service UUID setting and its env var from
WALLET_INCOME_FROM_IPG to WALLET_IPG_CREDIT across settings and the
income-deposit flow in apps/pg/models.py. Deployments must rename the
corresponding environment variable.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-31 16:57:28 +03:30
77c42ebe2a Merge pull request 'REFACTOR(wallets): rename WALLET_INCOME_FROM_IPG to WALLET_IPG_TRANSIT' (#2) from feature/wallet-refactor into master
Reviewed-on: #2
2026-08-31 09:20:44 -04:00
803c574796 REFACTOR(wallets): rename WALLET_INCOME_FROM_IPG to WALLET_IPG_TRANSIT
Rename the wallet-service UUID setting and its env var from
WALLET_INCOME_FROM_IPG to WALLET_IPG_TRANSIT across settings and the
income-deposit flow in apps/pg/models.py. Deployments must rename the
corresponding environment variable.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-31 16:47:02 +03:30
8ff67a2e29 Merge pull request 'feature/wallet-refactor' (#1) from feature/wallet-refactor into master
Reviewed-on: #1
2026-08-31 07:27:55 -04:00
72547b9785 ignore Python bytecode caches
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-19 15:09:55 +03:30
7dcb730507 FEATURE(wallets): rename WALLET_RIAL and add WALLET_INCOME_FROM_IPG
WALLET_RIAL -> WALLET_RIAL_DEPOSIT to match the naming used for the same
wallet-service UUID in the advertising/settlement/promotions repos. Also
adds WALLET_INCOME_FROM_IPG and wires it in: after a successful wallet
charge, the commission portion is deposited separately into it (attributed
to the requesting OAuth2 application) instead of never entering the wallet
ledger. The income deposit is best-effort and logs on failure rather than
failing an already-successful charge.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-19 15:09:49 +03:30
6f2d5e0bd7 run by docker via base:debian13 2026-05-02 13:32:07 +03:30
a52ba09460 FEATURE(pg): add DateTimeRangeFilter to panel admin
add DateTimeRangeFilter to panel admin
2026-04-27 14:44:39 +03:30
Sayyid Hamid Mahdavi
f5ce799a38 better exception 2026-04-25 02:11:59 +03:30
Sayyid Hamid Mahdavi
7a215dc457 bug fix 2026-04-22 21:41:23 +03:30
Sayyid Hamid Mahdavi
e77a711bbf bug fix 2026-04-22 21:38:24 +03:30
Sayyid Hamid Mahdavi
7ff91acb82 bug fix 2026-04-22 21:26:32 +03:30
Sayyid Hamid Mahdavi
a318185147 admin 2026-04-22 19:59:44 +03:30
Sayyid Hamid Mahdavi
82c35ffc4a comment hide 2026-04-22 19:54:25 +03:30
Sayyid Hamid Mahdavi
e114651dbe application gateway policy 2026-04-22 19:51:40 +03:30
Sayyid Hamid Mahdavi
556cdaf20a application gateway policy 2026-04-22 19:51:36 +03:30
Sayyid Hamid Mahdavi
82e35a98f7 hide sep 2026-04-17 14:17:57 +03:30
Sayyid Hamid Mahdavi
e7953b104b cleanup 2026-03-29 13:59:06 +03:30
Sayyid Hamid Mahdavi
da7d25d29e config 2026-03-29 13:40:20 +03:30
Sayyid Hamid Mahdavi
b1867a9a07 better exception 2026-03-28 14:37:46 +03:30
Sayyid Hamid Mahdavi
8f7f56f3df basic healthcheck and status 2026-03-15 15:08:32 +03:30
Sayyid Hamid Mahdavi
03ca49fbe3 correct reference_number 2026-03-10 10:43:24 +03:30
Sayyid Hamid Mahdavi
2a65dd4d1b correct typo 2026-03-10 10:37:39 +03:30
Sayyid Hamid Mahdavi
d749dedbef sep 2026-03-09 17:44:49 +03:30
Sayyid Hamid Mahdavi
6bab3b28a8 merge 2026-03-09 15:11:05 +03:30
Sayyid Hamid Mahdavi
d684bb7083 basic sep 2026-03-09 14:53:31 +03:30
Sayyid Hamid Mahdavi
31eabedfa6 use rial instead of toman 2026-02-17 11:20:54 +03:30
Sayyid Hamid Mahdavi
906866b8de template 2025-12-14 15:17:26 +03:30
Sayyid Hamid Mahdavi
4b2314879f template 2025-12-14 15:14:31 +03:30
Sayyid Hamid Mahdavi
7c93636e8d template 2025-12-14 15:08:02 +03:30
Sayyid Hamid Mahdavi
c437ee453d Merge pull request 'feat(ipg): fix failed request and change html files' (#10) from FIX/failed-request into master
Reviewed-on: addwin/pg#10
Reviewed-by: Sayyid Hamid Mahdavi <sahama@noreply.localhost>
2025-12-14 06:33:05 -05:00
09799c028c feat(ipg): fix failed request and change html files
fix failed request and change html files
2025-12-14 14:05:48 +03:30
Sayyid Hamid Mahdavi
ae47946265 logger 2025-12-09 10:38:15 +03:30
Sayyid Hamid Mahdavi
c6cd842b72 cleanup 2025-12-04 15:06:16 +03:30
Sayyid Hamid Mahdavi
8f99f97cbb Merge remote-tracking branch 'origin/master' 2025-11-15 18:03:38 +03:30
Sayyid Hamid Mahdavi
f851de4dde cleanup 2025-11-15 18:03:27 +03:30
Sayyid Hamid Mahdavi
bef4cf17d2 Merge pull request 'FEAT(pg): ipg commission calculation' (#8) from FEATURE/payment-commission_swagger into master
Reviewed-on: addwin/pg#8
Reviewed-by: Sayyid Hamid Mahdavi <sahama@noreply.localhost>
2025-11-15 06:30:54 -05:00
d0e8b24321 FEAT(pg): ipg commission calculation
ipg commission calculation
api/calculate_commission/?amount=300000
2025-11-15 14:59:15 +03:30
179677756a FEAT(pg): ipg commission calculation
ipg commission calculation
api/calculate_commission/?amount=300000
2025-11-15 14:52:32 +03:30
Sayyid Hamid Mahdavi
47718531bf Merge pull request 'FEAT(pg): ipg commission calculation' (#7) from FEATURE/payment-commission into master
Reviewed-on: addwin/pg#7
Reviewed-by: Sayyid Hamid Mahdavi <sahama@noreply.localhost>
2025-11-15 06:10:23 -05:00
89133022b1 FEAT(pg): ipg commission calculation
api/calculate_commission/?amount=300000
2025-11-15 14:38:47 +03:30
01744e4139 Merge branch 'master' of https://git.addwin.ir/addwin/pg into FEATURE/payment-commission
# Conflicts:
#	apps/pg/models.py
2025-11-15 14:31:15 +03:30
6aceb75185 FEAT(pg): ipg commission calculation
api/calculate_commission/?amount=300000
2025-11-15 14:15:54 +03:30
Sayyid Hamid Mahdavi
1a8e210e87 cleanup 2025-11-13 16:20:19 +03:30
Sayyid Hamid Mahdavi
a2b1e83f69 Merge pull request 'FEATURE/payment-commission' (#6) from FEATURE/payment-commission into master
Reviewed-on: addwin/pg#6
Reviewed-by: Sayyid Hamid Mahdavi <sahama@noreply.localhost>
2025-11-11 07:30:55 -05:00