Commit Graph

537 Commits (492a4ca2baf1ca6805edd1c1bd001ab7da947abc)

Author SHA1 Message Date
Firman Ramdhani 7da22277f1 feat: remove MDR column on income
continuous-integration/drone/push Build is passing Details
2024-09-10 10:37:48 +07:00
Firman Ramdhani bf73cb6b43 feat: adjustment to measure at column income report
continuous-integration/drone/push Build is passing Details
2024-09-10 10:29:31 +07:00
Firman Ramdhani 6fb582204a Merge branch 'feat/fix-couch-transaction' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report
continuous-integration/drone/push Build is passing Details
2024-09-09 14:30:53 +07:00
Firman Ramdhani d283caa898 feat: rename label header
continuous-integration/drone/push Build is passing Details
2024-09-09 14:26:49 +07:00
firmanr ac3ee266b9 Merge pull request 'feat: open guard cancel recap recon and add new logic for recap recon cancel handler and change logic recap handler' (#80) from feat/reconciliation into development
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #80
2024-09-06 10:58:46 +00:00
Firman Ramdhani 3720df31d8 feat: open guard cancel recap recon and add new logic for recap recon cancel handler and change logic recap handler
continuous-integration/drone/push Build is passing Details
2024-09-06 17:57:51 +07:00
Firman Ramdhani 7fb2995f38 feat: update query report income and merge with development branch
continuous-integration/drone/push Build is passing Details
2024-09-04 18:26:40 +07:00
Firman Ramdhani 07e7b86cd4 feat: update query report income and merge with development branch
continuous-integration/drone/push Build is passing Details
2024-09-04 18:21:08 +07:00
Firman Ramdhani db57b1973e Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/fix-couch-transaction 2024-09-04 18:20:13 +07:00
Firman Ramdhani 92d60d4496 feat: update query report income
continuous-integration/drone/push Build is passing Details
2024-09-04 18:19:42 +07:00
firmanr b716c75a2c Merge pull request 'feat/fix-couch-transaction' (#78) from feat/fix-couch-transaction into development
continuous-integration/drone/push Build is passing Details
Reviewed-on: #78
2024-09-04 10:26:33 +00:00
Firman Ramdhani 45306dde57 feat: update import couch module
continuous-integration/drone/push Build is passing Details
2024-09-04 15:22:42 +07:00
irfan 539676aa30 chore: add label to apm
continuous-integration/drone/tag Build is passing Details
continuous-integration/drone/push Build is passing Details
2024-09-03 11:45:30 +00:00
shancheas 1a2a37d185 chore: add label to APM 2024-09-03 18:44:04 +07:00
shancheas 665eacd39f feat: add reject QR gate
continuous-integration/drone/tag Build is passing Details
2024-09-03 10:23:02 +07:00
shancheas 9d98003a2d feat: add detail formula api getter
continuous-integration/drone/tag Build is passing Details
2024-09-03 09:45:23 +07:00
shancheas 45c4bde838 feat: add gate scanner module
continuous-integration/drone/tag Build is passing Details
2024-09-02 13:59:19 +07:00
shancheas b9927da0c4 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build is passing Details
2024-09-02 13:07:38 +07:00
Firman Ramdhani d523009acd feat: add report income per item master
continuous-integration/drone/tag Build is failing Details
2024-08-30 19:32:03 +07:00
Firman Ramdhani 457ce30cc1 feat: update email template
continuous-integration/drone/tag Build is passing Details
2024-08-30 15:27:24 +07:00
shancheas e7a7ffb2bc feat: add variable config to formula 2024-08-29 17:19:24 +07:00
Firman Ramdhani 2527437577 feat: update validation unique data on payment method module
continuous-integration/drone/tag Build is passing Details
2024-08-29 13:31:24 +07:00
shancheas ce372de1fd fix: remove event when update privilege
continuous-integration/drone/tag Build is passing Details
2024-08-28 19:48:08 +07:00
Firman Ramdhani 8590165755 feat: setup superset BE 2024-08-27 09:50:54 +07:00
Firman Ramdhani cb9421622d feat: setup env for superset BE 2024-08-27 09:44:49 +07:00
Firman Ramdhani dc97d5e14a feat: setup superset BE 2024-08-27 09:37:38 +07:00
Firman Ramdhani 9f50d56cea feat: setup superset BE 2024-08-26 19:04:06 +07:00
shancheas c3950c7041 fix: update demography enum 2024-08-21 20:34:07 +07:00
shancheas 464c10722c fix: update item to update item rate 2024-08-21 18:42:53 +07:00
shancheas 9815c667f0 feat: create api to bulk update privileges
continuous-integration/drone/tag Build is passing Details
2024-08-21 17:06:20 +07:00
shancheas 84b829a7fa feat: add breakdown bundling to item transaction
continuous-integration/drone/tag Build is passing Details
2024-08-21 16:46:36 +07:00
shancheas eaf0f43a24 fix: add bundling to booking couch db
continuous-integration/drone/tag Build is passing Details
2024-08-21 11:14:41 +07:00
shancheas 22b418b257 fix: update price bundling items 2024-08-21 10:56:57 +07:00
shancheas d5adc48d9b fix: breakdown item rates wrong value
continuous-integration/drone/tag Build is passing Details
2024-08-21 10:30:05 +07:00
shancheas 009576c841 feat: add bundling relation for couch db
continuous-integration/drone/tag Build is passing Details
2024-08-20 18:37:10 +07:00
shancheas 7c7b121b49 fix: fix break down bundling item rates
continuous-integration/drone/tag Build is passing Details
2024-08-20 17:16:14 +07:00
shancheas 8abdbb7b55 fix: add mix nationality to demography 2024-08-20 15:44:32 +07:00
shancheas fc15cb9db6 fix: update transaction
continuous-integration/drone/tag Build is passing Details
2024-08-20 13:22:04 +07:00
shancheas 9a72c40984 feat: add bundling item to refund
continuous-integration/drone/tag Build is passing Details
2024-08-20 12:05:36 +07:00
shancheas f2bc4dd46d feat: add breakdown item to transaction 2024-08-20 11:52:20 +07:00
shancheas f4387767a8 fix: add item rate to bundling breakdown
continuous-integration/drone/tag Build is passing Details
2024-08-16 18:46:10 +07:00
shancheas 8b82f9b7db feat: estimation play to item 2024-08-16 16:44:04 +07:00
shancheas ee232447b6 fix: add breakdown bundling response to item and item rate
continuous-integration/drone/tag Build is passing Details
2024-08-16 15:11:15 +07:00
shancheas a2a9c16619 wip: add transaction demography model 2024-08-16 14:21:36 +07:00
shancheas 6227555671 wip: demography data 2024-08-15 17:12:35 +07:00
shancheas fa286820fc fix: add breakdown bundling and profit to response
continuous-integration/drone/tag Build is passing Details
2024-08-15 17:12:12 +07:00
shancheas e966de6158 feat: add bundling breakdown type 2024-08-15 16:04:15 +07:00
shancheas 50e8951b71 feat: add share profit to item
continuous-integration/drone/tag Build is passing Details
2024-08-15 14:27:54 +07:00
firmanr cefeef8854 Merge pull request 'feat: fixed midtrans' (#73) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #73
2024-08-12 13:01:13 +00:00
Firman Ramdhani f30a23d3c4 feat: fixed midtrans 2024-08-12 20:00:47 +07:00
shancheas dcf0a55dfc fix: remove payment_type_method_id when cancel
continuous-integration/drone/tag Build was killed Details
2024-08-12 19:59:57 +07:00
firmanr 3678353f34 Merge pull request 'feat: fixed midtrans' (#72) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #72
2024-08-12 12:51:36 +00:00
Firman Ramdhani ab903d4554 feat: fixed midtrans 2024-08-12 19:51:17 +07:00
shancheas bd13f50bc0 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build is passing Details
2024-08-12 19:47:21 +07:00
shancheas f4939ffe89 fix: cancel data payment 2024-08-12 19:47:10 +07:00
firmanr 4fe385bca1 Merge pull request 'feat: fixed midtrans' (#71) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #71
2024-08-12 12:41:38 +00:00
Firman Ramdhani be7c74ec72 feat: fixed midtrans 2024-08-12 19:40:54 +07:00
shancheas 88cc9f4bc3 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build is passing Details
2024-08-12 19:34:54 +07:00
shancheas dc595dfb07 fix: mapping transaction cancel 2024-08-12 19:34:34 +07:00
Firman Ramdhani 08e018e16b Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into fix/bug-firman 2024-08-12 19:30:20 +07:00
Firman Ramdhani cc62910493 feat: fixed midtrans 2024-08-12 19:29:21 +07:00
firmanr ff44be66e2 Merge pull request 'feat: fixed midtrans' (#69) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #69
2024-08-12 12:27:03 +00:00
Firman Ramdhani b9b1695dc5 feat: fixed midtrans 2024-08-12 19:26:39 +07:00
firmanr 617a08e3f2 Merge pull request 'feat: fixed midtrans' (#68) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #68
2024-08-12 12:14:51 +00:00
Firman Ramdhani aaf6f97e57 feat: fixed midtrans 2024-08-12 19:14:25 +07:00
shancheas 538bd0e58e Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build is passing Details
2024-08-12 18:41:45 +07:00
shancheas ceae06779e fix: booking date undefined 2024-08-12 18:41:28 +07:00
Firman Ramdhani a015353990 feat: fixed midtrans 2024-08-12 18:37:37 +07:00
Firman Ramdhani c65f0dc9dc feat(SPG-851): fix midtrans 2024-08-12 18:01:59 +07:00
firmanr c98b8da9ba Merge pull request 'feat:' (#65) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #65
2024-08-12 09:18:08 +00:00
Firman Ramdhani bca3682826 feat: 2024-08-12 16:17:36 +07:00
shancheas 29cc6dfae6 fix: add parameter payment total value greater than 0
continuous-integration/drone/tag Build is passing Details
2024-08-12 15:54:21 +07:00
shancheas f9937d84ab fix(SPG-848): exclude counter transaction with null payment type 2024-08-12 15:46:53 +07:00
Firman Ramdhani b597a2f184 feat(SPG-265): report reconciliation 2024-08-12 10:50:02 +07:00
Firman Ramdhani d6fc817cef feat: remove unused report 2024-08-09 17:38:35 +07:00
Firman Ramdhani 64d812bef1 feat(SPG-267): report cash withdrawals 2024-08-09 17:21:12 +07:00
Firman Ramdhani 3b8310581b feat(SPG-266): report cashier log 2024-08-09 16:10:57 +07:00
Firman Ramdhani 21b9549b52 feat(SPG-264): report refund 2024-08-09 16:06:17 +07:00
Firman Ramdhani 76b518614f feat(SPG-263): report pemesanan 2024-08-09 15:52:53 +07:00
Firman Ramdhani 841f8889ec Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into fix/bug-firman 2024-08-09 15:43:25 +07:00
Firman Ramdhani bc8476a56e feat(SPG-268): report pemberian diskon 2024-08-09 15:43:13 +07:00
shancheas fe6572a770 fix: only check transaction more than 1 day
continuous-integration/drone/tag Build is passing Details
2024-08-09 15:23:20 +07:00
shancheas acf8861823 feat: add sync midtrans transaction 2024-08-09 15:18:43 +07:00
Firman Ramdhani a319b64abe feat(SPG-259): report pendapatan per item 2024-08-09 15:14:37 +07:00
Firman Ramdhani 3b07c8de99 feat: fix access control download 2024-08-09 11:27:00 +07:00
Firman Ramdhani f0c1410532 feat(SPG-258): create report income and fix calculate hpp on transaction 2024-08-09 11:16:56 +07:00
shancheas c5fdca615f fix(SPG-816): add payment date and payment method
continuous-integration/drone/tag Build is passing Details
2024-08-08 18:24:59 +07:00
shancheas e00a6aae31 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build is passing Details
2024-08-08 18:10:32 +07:00
shancheas f5425ccfb1 feat: add change status midtrans 2024-08-08 18:10:18 +07:00
Firman Ramdhani 13895394b3 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into fix/bug-firman 2024-08-08 17:28:42 +07:00
Firman Ramdhani b36e35ea00 feat(SPG-823): add item access control 2024-08-08 17:28:17 +07:00
shancheas e9c819987e fix: add payment_midtrans_url to transactions
continuous-integration/drone/tag Build was killed Details
2024-08-08 17:27:51 +07:00
shancheas a61f8b853d fix(SPG-817): invoice expired not send email
continuous-integration/drone/tag Build is passing Details
2024-08-08 17:07:03 +07:00
shancheas efe5661a57 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build is passing Details
2024-08-08 15:47:53 +07:00
shancheas 30d3d91bba fix(SPG-817): send email when status expired 2024-08-08 15:47:39 +07:00
firmanr 1fa4d315be Merge pull request 'fix/bug-firman' (#59) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #59
2024-08-08 08:42:34 +00:00
shancheas bcdf656d5d fix: midtrans error total != qty * price 2024-08-08 15:34:34 +07:00
Firman Ramdhani 63152ec90e feat(SPG-833): add key refund_type on get index 2024-08-08 15:24:35 +07:00
Firman Ramdhani 990d73bdb1 feat(SPG-837): validate delete and in active when data session type has relation 2024-08-08 15:07:38 +07:00
Firman Ramdhani 1dae9ec356 feat(SPG-780): sync data session type 2024-08-08 14:51:38 +07:00
Firman Ramdhani 8de744bc58 feat(SPG-782): update base price at item rate when price on item rate not edited before 2024-08-08 13:19:03 +07:00
Firman Ramdhani f8618ec0cd Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into fix/bug-firman 2024-08-08 11:28:54 +07:00
shancheas 1e8a07ec55 fix: change pos transaction event from update to change status 2024-08-08 11:27:20 +07:00
Firman Ramdhani 810a1c5bf5 feat: add planning comment for handle change status from multiple tabs 2024-08-07 22:18:19 +07:00
Firman Ramdhani b57da1d21a feat(SPG-818): fix condition transaction status change handler 2024-08-07 18:47:08 +07:00
shancheas 8dd36042eb fix(SPG-804): cancel transaction to pending booking
continuous-integration/drone/tag Build is passing Details
2024-08-07 18:04:53 +07:00
firmanr 72e47c2486 Merge pull request 'feat(SPG-737): fix filter reconciliation' (#57) from fix/bug-firman into development
Reviewed-on: #57
2024-08-07 10:46:32 +00:00
Firman Ramdhani cfb0d3c60f feat(SPG-792) : fix sync transaction data 2024-08-07 17:46:14 +07:00
Firman Ramdhani 0c3abc6a8f feat: add get data on couch service 2024-08-07 16:41:13 +07:00
Firman Ramdhani 1fcbe57018 feat: remove console 2024-08-07 16:33:20 +07:00
Firman Ramdhani ba6ee4a408 feat(SPG-737): fix filter reconciliation 2024-08-07 14:47:19 +07:00
shancheas e4a631b929 fix: move google credential to folder
continuous-integration/drone/tag Build is passing Details
2024-08-07 12:30:55 +07:00
shancheas dbdc7a0203 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build is passing Details
2024-08-07 11:48:55 +07:00
shancheas fcaf4a07a1 log: add APM to handler 2024-08-07 11:48:39 +07:00
Firman Ramdhani 0658b503bd feat(SPG-656): allow input number on formula 2024-08-07 11:05:37 +07:00
Firman Ramdhani 9802d983bb feat(SPG-800): add validation delete on data booking transaction 2024-08-07 10:31:19 +07:00
shancheas e8baaa12d2 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2024-08-06 16:06:43 +07:00
shancheas 6ca74ad6f7 fix: lint 2024-08-06 16:06:30 +07:00
firmanr 955f00cc9d Merge pull request 'feat(SPG-793): fix time at report log' (#54) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #54
2024-08-06 09:05:27 +00:00
Firman Ramdhani b48a469720 feat(SPG-772): fix key settlement date on booking module 2024-08-06 16:04:20 +07:00
shancheas 61d8f56385 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build was killed Details
2024-08-06 16:04:13 +07:00
shancheas bacdb1773b fix: item rates not generated when create period season 2024-08-06 16:03:42 +07:00
Firman Ramdhani 655157239d feat(SPG-793): fix time at report log 2024-08-06 13:23:21 +07:00
Firman Ramdhani aaee458df6 feat(SPG-773): set item name to unique 2024-08-06 12:47:09 +07:00
Firman Ramdhani 2f19db8dd7 feat(SPG-777): add validation delete for tenant item bundling 2024-08-06 11:40:18 +07:00
Firman Ramdhani e7664be8a8 feat(SPG-777): add validation delete for tenant item bundling 2024-08-06 11:39:40 +07:00
Firman Ramdhani 26db7d2745 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/report 2024-08-06 11:37:59 +07:00
Firman Ramdhani e922db827d feat(SPG-777): add validation delete for tenant item bundling 2024-08-06 11:33:51 +07:00
shancheas 5dde995ab8 fix: fail to cancel transaction
continuous-integration/drone/tag Build is passing Details
2024-08-06 10:37:56 +07:00
shancheas 79d1c564ff log: add APM log to couch handler
continuous-integration/drone/tag Build is passing Details
2024-08-06 06:16:10 +07:00
shancheas e7abc7db13 fix: move mail template to assets folder 2024-08-06 06:13:13 +07:00
shancheas 81a463e761 chore: update file location
continuous-integration/drone/tag Build is passing Details
2024-08-05 15:37:27 +07:00
shancheas c741a55577 fix: move image from file to base64 string
continuous-integration/drone/tag Build is passing Details
2024-08-05 15:18:24 +07:00
shancheas 81dad9a69c fix: change logo image location
continuous-integration/drone/tag Build is passing Details
2024-08-05 15:00:13 +07:00
shancheas 8999ed1bf0 fix: error image and typo
continuous-integration/drone/tag Build is passing Details
2024-08-05 14:43:42 +07:00
Aswin Ashar Abdullah feee9a3439 fix(SPG-494) PDF Generator 2024-08-04 02:51:11 +07:00
aswin b05e6fab5a Merge pull request 'development' (#50) from development into feat/pdf-generator
Reviewed-on: #50
2024-08-02 12:01:09 +00:00
Aswin Ashar Abdullah b08325a53c fix(email) checkpoint email service 2024-08-02 18:59:31 +07:00
Aswin Ashar Abdullah a1f7108bc5 feat(SPG-233) Integration Google Calendar API 2024-08-02 18:36:42 +07:00
Aswin Ashar Abdullah 2e4d5df17a fix(SPG-762) BE - integrasi dengan API Midtrans - untuk update status pembayaran 2024-08-02 18:11:36 +07:00
Aswin Ashar Abdullah 4fcd852d8d fix(SPG-769) save edit data terkena validasi status transaksi settled 2024-08-02 17:59:30 +07:00
Aswin Ashar Abdullah 0f05656ca2 fix(booking) perbaikan column payment type counter 2024-08-02 17:54:12 +07:00
Aswin Ashar Abdullah 0bec3c6590 fix(SPG-750) Ketika sales di PoS di cancel, pada rekondiliasi - recap, valuenya tidak berkurang 2024-08-02 17:53:29 +07:00
Aswin Ashar Abdullah 8eee99fce5 fix(SPG-745) Data booking status active dan settled (tipe pembayaran selain counter) belum masuk PoS 2024-08-02 17:49:11 +07:00
Aswin Ashar Abdullah 239e2d778a feat(SPG-760) Validasi Bundling dan Item active inactive 2024-08-02 17:12:12 +07:00
Aswin Ashar Abdullah cc01b23e2a fix(SPG-754) Di hak akses PoS, penjualan seharusnya tidak ada check box delete 2024-08-02 16:56:34 +07:00
Aswin Ashar Abdullah 0b502188af fix(SPG-687) Booking status pending seharusnya bisa di cancel 2024-08-02 16:08:26 +07:00
Aswin Ashar Abdullah e38fbc65bd fix(SPG-759) Ketika ada item baru dibuat ( kondisi sudah ada data item rate untuk product lain ) 2024-08-02 16:00:05 +07:00
Aswin Ashar Abdullah 0e47b99ca7 fix(SPG-756) Untuk value field sales margin (%) seharusnya bisa mempunyai value dibelakang koma 2024-08-02 15:28:56 +07:00
Aswin Ashar Abdullah e401a1bf4c fix(SPG-742) Filter status, sumber, tipe pembayaran, pembayaran via, bank, tgl konfirmasi belum jalan 2024-08-02 15:16:43 +07:00