github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,130 Commits
3 Branches
68 Tags
144 MiB
Commit Graph

1130 Commits (2c0dc9d8054e34bf7dbc12a45fa2799ae27c8a73)

Author SHA1 Message Date
Qiuyi LI aa382b7167
Merge pull request #36 from LQYBill/release 
Release
 2023-10-13 11:35:32 +02:00
Qiuyi LI e1d7b36c13 Release 1.7.0: Export Excel file to PDF by default after invoice generation 2023-10-13 10:09:51 +02:00
Qiuyi LI 769bd9a58a
Merge pull request #35 from LQYBill/dev 
Release 1.7.0
 2023-10-11 16:52:52 +02:00
Qiuyi LI dd6d219c3d
Merge pull request #34 from LQYBill/feature/breakdownPdf 
feature : generation of pdf for invoice during breakdown invoicing
 2023-10-10 12:14:57 +02:00
Gauthier LO a02f3dbdb4 feature : generation of pdf for invoice during breakdown invoicing 2023-10-10 12:00:55 +02:00
Gauthier LO 9d765591a9 feature : (WIP) Expenses Overview + LogisticChannelChoice job 2023-10-09 16:39:02 +02:00
Qiuyi LI afc05eed6e
Merge pull request #33 from LQYBill/release 
Release 1.6.2
 2023-09-18 12:12:31 +02:00
Qiuyi LI c42015520c Update project version 2023-09-15 11:39:10 +02:00
Qiuyi LI 63b61d3f24
Merge pull request #32 from LQYBill/dev 
Hotfixes
 2023-09-15 11:25:42 +02:00
Qiuyi LI 8b32a17a00
Merge pull request #31 from LQYBill/fix/invoiceExcelBug 
fix: Excel display bug in invoices
 2023-09-15 11:21:50 +02:00
Qiuyi LI 8228862f39
Update AbstractInvoice.java 
Cleanup comments
 2023-09-15 11:21:37 +02:00
Qiuyi LI abada459bb
Update AbstractInvoice.java 
Delete system.out.println
 2023-09-15 11:20:28 +02:00
Gauthier LO 0561f8a870 fix: Excel display bug in invoices 2023-09-15 11:02:50 +02:00
Qiuyi LI f64086699d
Merge pull request #30 from LQYBill/archive_order_job_rate_limiter 
Archive order job rate limiter
 2023-09-14 16:16:26 +02:00
Qiuyi LI a0db239994 Use ThrottlingExecutorService in ArchiveOrderJob as MabangAPI has a 300 requests per minute limit 2023-09-14 16:13:48 +02:00
Qiuyi LI bcf57915cc Add thread executor service with throttling 2023-09-14 16:12:40 +02:00
Qiuyi LI c21a8b50fe Update project version 2023-09-13 16:40:40 +02:00
Qiuyi LI 7d85e3becc
Merge pull request #29 from LQYBill/dev 
Hotfix : add tube rule for 30X40 portraits
 2023-09-13 16:39:55 +02:00
Qiuyi LI 18a8448684
Merge pull request #28 from LQYBill/update_tube_adding_job 
Add tube rule for 30X40 portraits
 2023-09-13 16:23:03 +02:00
Qiuyi LI cf2b51c0f7 Add tube rule for 30X40 portraits 2023-09-13 16:21:26 +02:00
Qiuyi LI 76c6d7a853 Merge remote-tracking branch 'origin/release' into release 2023-09-13 15:27:32 +02:00
Gauthier LO cff04fe906 feature : (WIP) Expenses overview + transactions VIEW 2023-09-12 12:26:51 +02:00
Gauthier LO fd35ea1c3e feature : (WIP) Invoicing page for customer 2023-09-06 14:26:33 +02:00
Gauthier LO 061657d9bd fix: digit format in invoices 2023-08-30 15:30:26 +02:00
Gauthier LO 5aed3a9156 Merge branch 'feature/creditPage' of github.com:LQYBill/wia_app into feature/creditPage 2023-08-25 16:30:45 +02:00
Gauthier LO cd9e6e7f45 feature: (WIP) debit + fix breakdownInvoice mail 2023-08-25 16:27:06 +02:00
Gauthier LO 5bade5b89e feature: (WIP) Credit Page 2023-08-25 16:06:40 +02:00
Gauthier LO 87241cc805 feature: (WIP) debit + fix breakdownInvoice mail 2023-08-25 16:06:10 +02:00
Qiuyi LI 97ef71d577
Merge pull request #27 from LQYBill/dev 
Use maven gpg plugin
 2023-08-25 11:36:14 +02:00
Qiuyi LI 708cc5cd73
Merge pull request #26 from LQYBill/fix/mavenGpgPlugin 
Fix/maven gpg plugin
 2023-08-25 11:35:13 +02:00
Qiuyi LI 9d2697affa Use classpath loader for FreeMarker template 2023-08-25 11:33:12 +02:00
Gauthier LO 07ba6510fd added maven gpg plugin 2023-08-25 11:32:46 +02:00
Gauthier LO 14ae44058f feature: (WIP) Credit Page 2023-08-24 16:35:27 +02:00
Qiuyi LI e7857333e3 Update project version 2023-08-24 15:41:46 +02:00
Qiuyi LI 84db512e7c
Merge pull request #25 from LQYBill/dev 
Release note 1.6.0
 2023-08-24 15:40:37 +02:00
Qiuyi LI 8da45dce22 Code optimization 2023-08-24 14:03:32 +02:00
Qiuyi LI 0eb6aadbff
Merge pull request #24 from LQYBill/fix/shippingCalculation 
fix: shipping fee calculation precision
 2023-08-23 11:30:52 +02:00
Gauthier LO dc4d67fcf8 fix: shipping fee calculation precision 2023-08-22 17:34:03 +02:00
Qiuyi LI ba9ba76a7e
Merge pull request #23 from LQYBill/fix/pendingTask 
Fix/pending task
 2023-08-22 16:02:04 +02:00
Gauthier LO f2ff97b1d3 fix: cancelInvoice 2023-08-22 15:57:29 +02:00
Gauthier LO 06d405b7e0 feature : task history 2023-08-22 15:15:24 +02:00
Qiuyi LI ef0ff44d23
Merge pull request #21 from LQYBill/feature/breakdownInvoice 
Feature/breakdown invoice
 2023-08-22 15:12:10 +02:00
Qiuyi LI b3f10e42ea
Merge pull request #22 from LQYBill/fix/cancelInvoice 
Fix/cancel invoice
 2023-08-22 15:11:57 +02:00
Qiuyi LI cebff71e80 Revert "Delete application-dev.yml" 
This reverts commit 828aeacf1a.
 2023-08-22 14:52:37 +02:00
Gauthier LO e57aea61f0 fix : cancel invoice now revert erp status from 4 to 3 2023-08-21 17:54:36 +02:00
Qiuyi LI 828aeacf1a
Delete application-dev.yml 2023-08-21 15:42:22 +02:00
Gauthier LO 1fb0f154ca email is now sent to user and service 2023-08-21 15:16:54 +02:00
Qiuyi LI 997b87a085 Update PlatformOrderContent model 2023-08-21 15:05:20 +02:00
Qiuyi LI 049d48f928 Retrieve specifics aka customization data of PlatformOrderContent 2023-08-21 14:36:35 +02:00
Gauthier LO cd4ad1e5fe feature : Making Shipping invoice in breakdown page + zip files and email 2023-08-21 12:45:04 +02:00