Commit Graph

451 Commits (88b4c661394ed4836369a3a79fda23ae5ad83f8b)

Author SHA1 Message Date
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
Aswin Ashar Abdullah 1636f6b930 fix(SPG-743) Refund dengan code invoice yang sama terkena validasi 2024-08-02 14:38:36 +07:00
aswin d1892e7aa5 Merge pull request 'development' (#48) from development into feat/pdf-generator
Reviewed-on: #48
2024-08-02 06:32:20 +00:00
Firman Ramdhani d14d9101ae feat: add report CashierLogReport and CashWithdrawalsReport
continuous-integration/drone/tag Build is passing Details
2024-08-01 18:09:40 +07:00
Firman Ramdhani 746e24feb6 feat: add migration for table pos log
continuous-integration/drone/tag Build is passing Details
2024-08-01 17:48:21 +07:00
Firman Ramdhani 39d7eb28b9 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2024-08-01 17:45:55 +07:00
Firman Ramdhani 9d0d76120e feat: update model pos log 2024-08-01 17:45:33 +07:00
aswin 971407612c Merge pull request 'fix/data' (#47) from fix/data into development
Reviewed-on: #47
2024-08-01 10:37:35 +00:00
Aswin Ashar Abdullah 03ec533e86 fix(SPG-736) Cancel rekon statu Pending terkena validasi data pemesanan harus settled 2024-08-01 17:33:36 +07:00
Aswin Ashar Abdullah d413bd771b fix(SPG-735) Ketika recap di click berkali kali, transaksi menggunakan tipe cash jadi duplicate 2024-08-01 17:25:12 +07:00
Aswin Ashar Abdullah 11171b2859 fix(SPG-729) pemesanan data seharusnya berstatus proses refund ketika data refund berstatus draft 2024-08-01 17:01:39 +07:00
Firman Ramdhani 1e9cc9da4f feat: add default condition for type on booking report 2024-08-01 15:13:00 +07:00
Firman Ramdhani 46307774e1 Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development 2024-08-01 14:43:43 +07:00
Firman Ramdhani 62eccf29a5 feat: rename header title report 2024-08-01 14:43:37 +07:00
Aswin Ashar Abdullah 383fdce9f7 feat(pdf) checkpoint pdf 2024-08-01 14:36:20 +07:00
Aswin Ashar Abdullah 1ae7f4e097 fix(booking) perbaikan event deleted booking 2024-08-01 14:27:57 +07:00
Aswin Ashar Abdullah d4bd3d746c fix(filter) perbaikan filter season period 2024-08-01 14:00:14 +07:00
Aswin Ashar Abdullah 45f11003f2 fix(privilege) perbaikan privilege constants 2024-08-01 13:33:02 +07:00
Aswin Ashar Abdullah 2188d63943 fix(SPG-726) Update image pada item status active, data image tidak ter sync ke PoS 2024-07-31 19:05:08 +07:00
Aswin Ashar Abdullah 3af56fa5d5 fix(SPG-652) Item Tipe Bundling - validasi 2024-07-31 18:51:31 +07:00
Aswin Ashar Abdullah c49bb379bd fix(item price) perbaikan price item 2024-07-31 18:25:28 +07:00
Aswin Ashar Abdullah 0648eeffee fix(SPG-711) Internal server error sering sekali ketika confirm status draft ke status pending 2024-07-31 18:24:47 +07:00
Aswin Ashar Abdullah e8deba2882 fix(SPG-709) Data summary transaksi PoS tidak muncul di halaman rekonsiliasi setelah click button recap 2024-07-31 17:58:33 +07:00
Aswin Ashar Abdullah 19386c336e fix(SPG-710) ganti warning cancel jadi bahasa indonesia 2024-07-31 17:58:01 +07:00
Aswin Ashar Abdullah 58cf3f7ab0 fix(SPG-718) Validasi perubahan tipe wahana seharusnya tidak memvalidasi perubahan namanya 2024-07-31 16:29:04 +07:00
Aswin Ashar Abdullah d7c4b27749 feat(SPG-719) Season Period - API Index - tambahkan filter berdasarkan season type 2024-07-31 16:19:30 +07:00
Aswin Ashar Abdullah 0ac5754170 fix(SPG-703) Sync account superadmin ke Pouch Couch supaya bisa login di PoS 2024-07-31 16:11:59 +07:00
Aswin Ashar Abdullah b7557a5f19 fix(SPG-663) Pos Privileges - pemesanan seharusnya tidak ada create 2024-07-31 15:53:41 +07:00
Aswin Ashar Abdullah 61c512f7f4 fix(transaction) perbaikan data 2024-07-30 19:25:22 +07:00
aswin 30ffdca550 Merge pull request 'fix/data' (#43) from fix/data into development
continuous-integration/drone/tag Build is failing Details
Reviewed-on: #43
2024-07-30 11:33:11 +00:00
Aswin Ashar Abdullah c154af6cb7 fix(SPG-708) Muncul error saat meng cancel status pending - warninnya hanya bisa meng cancel status pending juga 2024-07-30 18:26:50 +07:00
Aswin Ashar Abdullah 197b3478ae fix(SPG_693) di hak akses pos pada bagian penjualan seharusnya ada checkbox pada kolom cancel dan ada hak akses reprint receipt 2024-07-30 18:22:23 +07:00
Aswin Ashar Abdullah c6be42299e fix(SPG-697) Pada index booking seharusnya transaksi pos tidak muncul, dan sesuaikan alur booking dengan pembayaran counter 2024-07-30 17:12:55 +07:00
Firman Ramdhani 9bcc72a69e feat: fix set false bookmark report
continuous-integration/drone/tag Build is passing Details
2024-07-30 16:59:11 +07:00
Aswin Ashar Abdullah dc6476a66f fix(SPG-687) Booking status pending seharusnya bisa di cancel, tapi ketika di cancel muncul error message, hanya status active yang bisa di cancel 2024-07-30 14:44:12 +07:00
Aswin Ashar Abdullah 4a9ca5eb5b fix(SPG-688) Ketika tgl booking di rubah web admin, tanggal booking pada PoS tidak ikut terupdate 2024-07-30 14:36:49 +07:00
aswin e1004b3843 Merge pull request 'fix/data' (#42) from fix/data into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #42
2024-07-30 06:56:07 +00:00
Aswin Ashar Abdullah 6632222c4b fix(SPG-677) Pada Index tgl invoice belum ada datanya, invoice data = tgl ketika booking di confirm ke status pending 2024-07-30 13:54:00 +07:00
Aswin Ashar Abdullah 945edbf76d fix(SPG-659) Muncul error get data saat confirm transaksi status draft ke pending 2024-07-30 13:50:23 +07:00
Aswin Ashar Abdullah 190f42d598 fix(SPG-645) Button generate price belum berfungsi 2024-07-30 13:46:57 +07:00
Aswin Ashar Abdullah d9bbe1290d fix(SPG-675) Error saat confirm status pending ( hanya bisa refund status settled ) padahal status sudah berubah ke proces refund 2024-07-30 13:08:50 +07:00
Aswin Ashar Abdullah 3e85d40885 feat(SPG-651) BE Reason Refund Request 2024-07-30 13:00:49 +07:00
Aswin Ashar Abdullah 7e38a67e80 fix(SPG-667) Kategori item status inactive seharusnya tidak terpanggil 2024-07-30 12:44:57 +07:00
Aswin Ashar Abdullah b91d9f7da8 fix(SPG-671) Item Bundling - validasi / warning jika item dalam bundling diinactivekan sedangkan masih berelasi, bundling harus di inactivekan dulu atau didelete 2024-07-30 12:24:31 +07:00
shancheas 57f2700c94 fix: change query runner to repository from base manager 2024-07-29 16:44:23 +07:00
Aswin Ashar Abdullah b3f0752ca0 fix(SPG-662) Search title banner belum jalan 2024-07-29 14:53:22 +07:00
Aswin Ashar Abdullah 33438f37ec fix(SPG-669) Validasi perubahan tipe wahana jika sudah mempunyai item yang berelasi 2024-07-29 14:48:05 +07:00
Aswin Ashar Abdullah 593955574a fix(SPG-664) admin Privilles - rekonsiliasi seharusnya tidak ada create 2024-07-29 14:37:46 +07:00
Aswin Ashar Abdullah 4ac711add5 fix(SPG-663) Pos Privilleges - pemesanan seharusnya tidak ada create 2024-07-29 14:37:12 +07:00
Aswin Ashar Abdullah 6096771597 fix(SPG-658) Validasi - tidak bisa confirm dari status pending ke waiting, ketika data pembayaran booking belum diisi ( untuk pembayaran bank transfer dan QRIS saja) 2024-07-26 17:14:04 +07:00
Aswin Ashar Abdullah 76fa380f1e fix(SPG-657) Kode Pembayaran - ketika booking status waiting di confirm di rekonsiliasi, kode pembayaran tidak muncul 2024-07-26 16:49:52 +07:00
Aswin Ashar Abdullah 1f4bf80908 fix(SPG-661) Filter rekonsiliasi exclude status draft 2024-07-26 16:28:25 +07:00
Aswin Ashar Abdullah 66c481c9b0 fix(SPG-645) Button generate price belum berfungsi 2024-07-26 16:20:22 +07:00
Aswin Ashar Abdullah 9cd50ad817 fix(SPG-655) Item Rate saat filter harga jadi mengambil base price (kemungkinan ada salah ambil priority 2024-07-26 15:43:34 +07:00
Aswin Ashar Abdullah 82105e8214 fix(rate) perbaikan update rate 2024-07-26 15:05:28 +07:00
Aswin Ashar Abdullah e68524380a fix(SPG-652) Item Tipe Bundling - Item yang sudah berrelasi atau dipakai pada bundling tidak dapat di delete atau di inactivekan sampai di lepas dari bundling nya 2024-07-26 15:03:37 +07:00
Aswin Ashar Abdullah a63eaf0110 fix(season) update fix priority 2024-07-26 14:03:38 +07:00
Aswin Ashar Abdullah e32a7c2eaf fix(base) delete query transaction
continuous-integration/drone/tag Build is passing Details
2024-07-26 11:41:18 +07:00
Aswin Ashar Abdullah a671404947 feat(SPG-554) BE - Integrasi Booking dengan Google Calendar 2024-07-25 16:03:43 +07:00
Aswin Ashar Abdullah d0163ae003 feat(SPG-125) Logging 2024-07-23 19:54:00 +07:00
Aswin Ashar Abdullah aa550f9d38 feat(SPG-612) Activity Log PoS 2024-07-23 19:24:40 +07:00
Aswin Ashar Abdullah 2fc80c7cfc fix(SPG-640) Sync harga ketika ditambahkan melalui item rate (case item sudah dibuat) 2024-07-23 18:25:57 +07:00
Aswin Ashar Abdullah 20848aab3c fix(SPG-644) Sync ketika privileges di update 2024-07-23 18:25:14 +07:00
aswin d81eaac4f6 Merge pull request 'fix/data' (#36) from fix/data into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #36
2024-07-22 11:34:52 +00:00
Aswin Ashar Abdullah 679b98d198 fix(SPG-611) Upload - pemindahan directory upload image 2024-07-22 18:33:50 +07:00
Aswin Ashar Abdullah 1ff5461311 fix(SPG-645) Button generate price belum berfungsi 2024-07-22 12:29:36 +07:00
Firman Ramdhani 2f9c96bdec Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development
continuous-integration/drone/tag Build is passing Details
2024-07-22 11:56:42 +07:00
Firman Ramdhani b1bc05fcb9 feat: adjustment report 2024-07-22 11:56:35 +07:00
Aswin Ashar Abdullah ef2697a3b1 fix(SPG-618) Error pada saat mengkonfirmasi / save pengembalian wahana baru 2024-07-22 11:40:43 +07:00
Aswin Ashar Abdullah c5cec31ab5 fix(SPG-641) Validasi ketika process save untuk aksi di rekonsiliasi, save data di refund, dan aksi di booking 2024-07-20 22:12:09 +07:00
Aswin Ashar Abdullah cc92ef26a1 fix(index) perbaikan index item - item rates 2024-07-19 17:47:09 +07:00
Aswin Ashar Abdullah 1560cb0512 fix(SPG-643) Sync batch data couch pouch 2024-07-19 17:46:48 +07:00
Aswin Ashar Abdullah fba7b9aae5 fix(SPG-620) Sales Price & Profit Share Formula - Tambahkan warning/validasi jika formula menyebabkan error 2024-07-19 14:43:47 +07:00
Aswin Ashar Abdullah 0b236cb879 fix(SPG-619) Informasi Season Periode tidak muncul jika tgl dipilih bukan tanggal hari ini 2024-07-19 13:27:17 +07:00
Aswin Ashar Abdullah 908834cdd9 fix(item) perbaikan item price 2024-07-18 18:14:46 +07:00
Aswin Ashar Abdullah 4840abf18e fix(index) perbaikan index data sort by order 2024-07-18 15:36:56 +07:00
Aswin Ashar Abdullah cd6a5737e7 fix(SPG-600) Filter Sumber, Tipe, Kontak pada index booking belum berjalan 2024-07-18 15:36:38 +07:00
aswin 853543ece5 Merge pull request 'feat/midtrans' (#31) from feat/midtrans into development
continuous-integration/drone/tag Build is passing Details
Reviewed-on: #31
2024-07-18 06:40:04 +00:00
Aswin Ashar Abdullah 37b12c960f fix(change-position) perbaikan change position module 2024-07-18 13:36:22 +07:00
Aswin Ashar Abdullah 8c9d0d6585 feat(SPG-423) Midtrans Integration 2024-07-18 12:45:46 +07:00
Aswin Ashar Abdullah 2551521539 feat(SPG-423) Midtrans Integration 2024-07-18 12:42:47 +07:00
Aswin Ashar Abdullah 403a75c835 feat(SPG-388) BE Send Mail with Google Mail 2024-07-17 19:10:35 +07:00
Firman Ramdhani 12359f3685 feat: setup colum report pengembalian
continuous-integration/drone/tag Build is passing Details
2024-07-17 14:18:59 +07:00
Firman Ramdhani d20fd4e175 feat: setup colum report pemesanan 2024-07-17 14:05:23 +07:00
aswin 05c98dcb14 Merge pull request 'feat/news' (#30) from feat/news into development
Reviewed-on: #30
2024-07-16 10:43:44 +00:00
Firman Ramdhani 6ca3766457 feat: fix get menu 2024-07-16 15:15:20 +07:00
Aswin Ashar Abdullah 9ac1fa9ae2 feat(SPG-460) REST API Read Banner 2024-07-16 13:30:33 +07:00