development #100

Merged

irfan merged 94 commits from development into production 2024-09-21 16:08:58 +00:00

Conversation 0 Commits 94 Files Changed 146

94 Commits (development)

Author	SHA1	Message	Date
shancheas	22f4e732db	fix: transaction NaN without discount	2024-09-21 23:04:59 +07:00
shancheas	34ae5964c4	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development	2024-09-21 07:24:34 +07:00
shancheas	f2fef65f20	fix: change total price to net price	2024-09-21 07:24:16 +07:00
firmanr	039531de3b	Merge pull request 'feat: move tipe item' (#99) from feat/adjustment-report into development ... Reviewed-on: #99	2024-09-20 12:01:57 +00:00
Firman Ramdhani	0b8bb72392	feat: move tipe item	2024-09-20 19:01:18 +07:00
firmanr	256c8f38bd	Merge pull request 'feat: update report' (#98) from feat/adjustment-report into development ... Reviewed-on: #98	2024-09-20 11:36:16 +00:00
Firman Ramdhani	109898b076	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report	2024-09-20 18:34:58 +07:00
shancheas	b2be2e0160	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development	2024-09-20 18:33:11 +07:00
shancheas	b4266d5d68	fix: add discount to calculator	2024-09-20 18:32:52 +07:00
Firman Ramdhani	f23a9f3510	feat: update report	2024-09-20 18:32:17 +07:00
firmanr	91370940d7	Merge pull request 'feat: fix filter report' (#97) from feat/adjustment-report into development ... Reviewed-on: #97	2024-09-20 10:51:25 +00:00
Firman Ramdhani	c15b4d8079	feat: fix filter report	2024-09-20 17:25:28 +07:00
shancheas	b16edb73e3	fix: report wrong non bundling profit share key	2024-09-20 13:01:38 +07:00
firmanr	ea58096287	Merge pull request 'feat/adjustment-report' (#96) from feat/adjustment-report into development ... Reviewed-on: #96	2024-09-20 04:50:52 +00:00
Firman Ramdhani	1dfcaf7b15	feat(SPG-969): feat set default payment_date_bank	2024-09-20 11:50:34 +07:00
Firman Ramdhani	8b58598955	feat(SPG-969): feat set default payment_date_bank	2024-09-20 11:49:58 +07:00
firmanr	5eb50c952f	Merge pull request 'feat/adjustment-report' (#95) from feat/adjustment-report into development ... Reviewed-on: #95	2024-09-20 04:33:19 +00:00
Firman Ramdhani	aaa0ca6f76	feat: fix report bug and create report tax	2024-09-20 11:32:48 +07:00
irfan	3de7bfbbe5	Merge pull request 'fix/price-calculator' (#94) from fix/price-calculator into development ... Reviewed-on: #94	2024-09-20 04:07:24 +00:00
shancheas	60c03fefa0	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into fix/price-calculator	2024-09-20 11:06:31 +07:00
shancheas	b34d54e7d0	fix: item bundling replace when edit	2024-09-20 11:06:09 +07:00
Firman Ramdhani	3fd97b8879	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report	2024-09-20 09:46:25 +07:00
irfan	93c822f34e	Merge pull request 'fix/price-calculator' (#93) from fix/price-calculator into development ... Reviewed-on: #93	2024-09-19 12:34:03 +00:00
shancheas	e09c76309e	fix: formula calculation	2024-09-19 19:33:28 +07:00
Firman Ramdhani	43deb04d92	feat(SPG-966): fix report income	2024-09-19 18:22:19 +07:00
shancheas	23043fb7f9	feat: change logic to save formula	2024-09-19 17:52:50 +07:00
Firman Ramdhani	1d377b574c	feat(SPG-966): fix report income	2024-09-19 17:50:11 +07:00
Firman Ramdhani	7d9f619858	feat(SPG-966): fix report income	2024-09-19 17:49:35 +07:00
shancheas	c06a2a0a2b	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into fix/price-calculator	2024-09-19 14:07:37 +07:00
shancheas	cc71814648	fix: bulk transaction action	2024-09-18 17:25:07 +07:00
irfan	004dfc9de5	Merge pull request 'feat/adjustment-report' (#92) from feat/adjustment-report into development ... Reviewed-on: #92	2024-09-18 10:14:59 +00:00
Firman Ramdhani	09d6dbaab2	feat: remove console on auth	2024-09-18 16:30:23 +07:00
Firman Ramdhani	c76594d767	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report	2024-09-18 16:25:39 +07:00
Firman Ramdhani	f4cf5178b8	feat: change auth concept	2024-09-18 16:25:29 +07:00
shancheas	ffbbf6e140	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development	2024-09-18 13:55:57 +07:00
shancheas	614a9346fb	feat: price calculator	2024-09-18 13:55:47 +07:00
irfan	f7c49d27d5	Merge pull request 'fix/income-report' (#91) from fix/income-report into development ... Reviewed-on: #91	2024-09-13 10:39:52 +00:00
irfan	2ee96a617f	fix: income item breakdown report	2024-09-13 10:39:04 +00:00
irfan	10049abc55	fix: income item report	2024-09-13 10:38:32 +00:00
irfan	01fbedab77	fix: income report	2024-09-13 10:37:15 +00:00
irfan	b2659def9a	ci: rollback to yarn, NPM is s*ck	2024-09-13 03:55:52 +00:00
firmanr	d597734467	Merge pull request 'feat: exclude privilege logout' (#90) from feat/adjustment-report into development ... Reviewed-on: #90	2024-09-13 03:49:40 +00:00
Firman Ramdhani	27a0c56af7	feat: exclude privilege logout	2024-09-13 10:48:45 +07:00
irfan	50ac2d97a4	ci: update Docker file use NPM instead of Yarn	2024-09-13 03:27:14 +00:00
firmanr	d788a9f1a1	Merge pull request 'feat(SPG-953): penyesuaian API Create dan Update pengguna baru dengan menambahkan opsi admin antrian' (#89) from feat/adjustment-report into development ... Reviewed-on: #89	2024-09-12 12:19:09 +00:00
Firman Ramdhani	c897e4fcde	feat(SPG-885): add validation login admin queue	2024-09-12 19:17:46 +07:00
Firman Ramdhani	14dd2880bc	feat(SPG-885): add api get item queue	2024-09-12 17:54:48 +07:00
Firman Ramdhani	3e920755bd	feat: create feature log user login and create auth admin queue	2024-09-12 17:16:56 +07:00
Firman Ramdhani	88b4c66139	feat: adjustment column dpp and total pajak at income item master	2024-09-11 18:15:16 +07:00
Firman Ramdhani	52c82a9a41	feat(SPG-953): penyesuaian API Create dan Update pengguna baru dengan menambahkan opsi admin antrian	2024-09-11 16:43:03 +07:00
shancheas	19494b3328	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development	2024-09-11 16:12:36 +07:00
shancheas	e1f2cdfa4d	wip: calculate share item	2024-09-11 16:12:22 +07:00
firmanr	918055beb9	Merge pull request 'feat: add enum queue admin' (#88) from feat/adjustment-report into development ... Reviewed-on: #88	2024-09-11 07:57:35 +00:00
Firman Ramdhani	283b783007	feat: add enum queue admin	2024-09-11 14:56:55 +07:00
firmanr	a2be2bb331	Merge pull request 'feat/adjustment-report' (#87) from feat/adjustment-report into development ... Reviewed-on: #87	2024-09-11 05:44:29 +00:00
Firman Ramdhani	d708ef9eee	feat: add column pos name	2024-09-11 12:42:09 +07:00
Firman Ramdhani	9709c4719b	feat: add column pos name	2024-09-11 12:38:16 +07:00
firmanr	d2db62339f	Merge pull request 'feat: penyesuaian error validasi create items' (#86) from feat/adjustment-report into development ... Reviewed-on: #86	2024-09-11 04:05:56 +00:00
Firman Ramdhani	07d1cc78e2	feat: penyesuaian error validasi create items	2024-09-11 11:05:36 +07:00
firmanr	8f430574ed	Merge pull request 'feat: rename label button email template midtrans' (#85) from feat/adjustment-report into development ... Reviewed-on: #85	2024-09-11 03:58:36 +00:00
Firman Ramdhani	f7198010d3	feat: rename label button email template midtrans	2024-09-11 10:57:25 +07:00
firmanr	a1641504f1	Merge pull request 'feat/adjustment-report' (#84) from feat/adjustment-report into development ... Reviewed-on: #84	2024-09-11 03:52:02 +00:00
Firman Ramdhani	6c5019f814	feat: adjustment dpp and total pajak di report icom per transaction	2024-09-11 10:51:10 +07:00
Firman Ramdhani	ff0ef28783	feat: create report tenant	2024-09-11 10:40:44 +07:00
firmanr	40aafaf571	Merge pull request 'feat: ignore sync delete data from POS data' (#83) from feat/adjustment-report into development ... Reviewed-on: #83	2024-09-10 10:26:19 +00:00
Firman Ramdhani	6fbb2e33b2	feat: ignore sync delete data from POS data	2024-09-10 17:25:59 +07:00
firmanr	b20385dacc	Merge pull request 'feat/adjustment-report' (#82) from feat/adjustment-report into development ... Reviewed-on: #82	2024-09-10 10:17:42 +00:00
Firman Ramdhani	6e5b19380b	feat(SPG-935): add column payment_date_bank	2024-09-10 17:15:52 +07:00
Firman Ramdhani	ab9ec4ac0e	feat(SPG-935): add column payment_date_bank	2024-09-10 17:11:20 +07:00
firmanr	0457fc9e1d	Merge pull request 'feat/adjustment-report' (#81) from feat/adjustment-report into development ... Reviewed-on: #81	2024-09-10 04:49:35 +00:00
Firman Ramdhani	3658ae4cdf	feat: adjustment filter pos no	2024-09-10 11:48:44 +07:00
Firman Ramdhani	d1b20e6b96	feat: create report tenant	2024-09-10 11:38:46 +07:00
Firman Ramdhani	f4ecbf0e66	feat: add net pedapatan di report rekonsiliasi	2024-09-10 10:55:13 +07:00
Firman Ramdhani	7da22277f1	feat: remove MDR column on income	2024-09-10 10:37:48 +07:00
Firman Ramdhani	bf73cb6b43	feat: adjustment to measure at column income report	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	2024-09-09 14:30:53 +07:00
Firman Ramdhani	d283caa898	feat: rename label header	2024-09-09 14:26:49 +07:00
Firman Ramdhani	1320492bf1	Merge branch 'production' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report	2024-09-09 11:26:48 +07:00
irfan	a6b1e5f49f	Update Dockerfile	2024-09-06 11:05:32 +00: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 ... Reviewed-on: #80	2024-09-06 10:58:46 +00:00
Firman Ramdhani	7fb2995f38	feat: update query report income and merge with development branch	2024-09-04 18:26:40 +07:00
Firman Ramdhani	07e7b86cd4	feat: update query report income and merge with development branch	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	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 ... Reviewed-on: #78	2024-09-04 10:26:33 +00:00
Firman Ramdhani	45306dde57	feat: update import couch module	2024-09-04 15:22:42 +07:00
shancheas	1a2a37d185	chore: add label to APM	2024-09-03 18:44:04 +07:00
shancheas	665eacd39f	feat: add reject QR gate	2024-09-03 10:23:02 +07:00
shancheas	9d98003a2d	feat: add detail formula api getter	2024-09-03 09:45:23 +07:00
shancheas	45c4bde838	feat: add gate scanner module	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	2024-09-02 13:07:38 +07:00
Firman Ramdhani	d523009acd	feat: add report income per item master	2024-08-30 19:32:03 +07:00
Firman Ramdhani	457ce30cc1	feat: update email template	2024-08-30 15:27:24 +07:00
shancheas	e7a7ffb2bc	feat: add variable config to formula	2024-08-29 17:19:24 +07:00