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

1025 Commits (8eccba5df2a474289af589d8889a4b42f121ad37)

Author SHA1 Message Date
Gauthier LO 8eccba5df2 maven jeecg 3.5.1 2023-08-17 16:21:12 +02:00
Gauthier LO a92cd741b1 feature: (WIP) Invoicing in breakdown page 2023-08-17 16:21:12 +02:00
Qiuyi LI 8d5a26bb62 Release note: Add SKU prices in RMB, add SAV refunds to invoice detail and minors improvements 2023-08-09 11:43:33 +02:00
Qiuyi LI 2223f19eab
Merge pull request #19 from LQYBill/sav_refunds_in_invoice_detail 
Sav refunds in invoice detail and RMB SKU prices
 2023-08-09 11:40:36 +02:00
Qiuyi LI f6dfaffa12 Feature: Add Luxembourg Post tracking number pattern 2023-08-09 11:30:51 +02:00
Qiuyi LI bc05f0db5a Feature: Add SKU prices in RMB, to be used in priority if present 2023-08-09 11:30:27 +02:00
Qiuyi LI 6c8d0c06b7 Fix: Do not retrieve SAV refunds for orders who haven't been invoiced yet in the first place 2023-08-08 11:17:22 +02:00
Qiuyi LI 2fa8cf0a2e Feature : Add SAV refunds to all invoices 2023-08-07 17:23:22 +02:00
Qiuyi LI 3aa3601303 Feature: Add SAV refunds (separate sheet) to invoice detail export 2023-08-07 17:22:48 +02:00
Qiuyi LI 476bbe47e2 Feature: Add method to get SAV refunds by shipping invoice number 2023-08-07 17:22:20 +02:00
Qiuyi LI e0191b62f9 Feature: Add shop name and Mabang ID to SavRefundWithDetail model 2023-08-07 16:55:56 +02:00
Qiuyi LI 3570da7c0f Add SQL backup scripts for existing views 2023-08-07 16:27:36 +02:00
Qiuyi LI b192d43a4c Release note 1.4.0: Product weights can now be mass edited 2023-08-07 15:50:20 +02:00
Qiuyi LI 846f75b10d
Merge pull request #18 from LQYBill/feature/weightEdit 
feature: product list page with editing feature
 2023-08-04 15:06:09 +02:00
Gauthier LO 7ac881f83c update by is now updated 2023-08-04 15:02:30 +02:00
Gauthier LO 255e304fd3 feature: product list page with editing feature 2023-08-04 12:43:45 +02:00
Qiuyi LI 710540a1c6 Release note 1.3.0: Add a "delete" button on shipping invoice list page to cancel an invoice 2023-08-02 17:55:23 +02:00
Qiuyi LI 8829c02c79
Merge pull request #16 from LQYBill/feature/deleteInvoice 
feature: cancel invoice
 2023-08-02 16:25:44 +02:00
Gauthier LO a7235bba36
Update PlatformOrderContentMapper.xml 2023-08-02 16:19:25 +02:00
Qiuyi LI f10d9c62e4 Merge remote-tracking branch 'origin/dev' into dev 2023-08-02 11:36:01 +02:00
Qiuyi LI f7b397dd0e
Merge pull request #15 from LQYBill/fix/revert3.5.0 
Revert "Merge pull request #13 from LQYBill/upgrade/master3.5.3"
 2023-08-02 11:35:23 +02:00
Gauthier LO aade40e44f Revert "Merge pull request #13 from LQYBill/upgrade/master3.5.3" 
This reverts commit 4a8446a294, reversing
changes made to c0d33758c1.
 2023-08-02 11:30:54 +02:00
Gauthier LO d2ddab74a1 feature: cancel invoice 
fix : orders invoiced twice
 2023-08-01 12:09:02 +02:00
Qiuyi LI cbe7a18857 Update project version 2023-07-31 16:45:43 +02:00
Qiuyi LI 72f433d7b5 Hotfix: Add missing shipping invoice number checks anywhere necessary 2023-07-31 16:43:14 +02:00
Qiuyi LI 4a8446a294
Merge pull request #13 from LQYBill/upgrade/master3.5.3 
Upgrade : from master v3.5.3
 2023-07-28 16:00:51 +02:00
Qiuyi LI d9b71b8527
Merge branch 'dev' into upgrade/master3.5.3 2023-07-28 16:00:29 +02:00
Qiuyi LI c0d33758c1 Release note 1.2.0: Add HLJob to retrieve parcel traces 2023-07-28 15:46:25 +02:00
Qiuyi LI b7e72dc963
Merge pull request #14 from LQYBill/hualei_parcel_trace_job 
Hualei parcel trace job
 2023-07-28 15:33:08 +02:00
Qiuyi LI 78532106a3 Create HLJob for parcel traces 2023-07-28 15:32:17 +02:00
Qiuyi LI 4de3ed4429 Add HL API models 2023-07-28 15:16:54 +02:00
Qiuyi LI aed2406c81 Add more ScanTypes 2023-07-28 15:06:14 +02:00
Qiuyi LI c4325cf75a Update DAO tracking numbers' pattern 2023-07-28 14:56:36 +02:00
Gauthier LO 94debfb669
Merge branch 'dev' into upgrade/master3.5.3 2023-07-27 11:12:59 +02:00
Qiuyi LI 1df5f6a7ae Hotfix: prolong HTTP requests timeout from 3s to 10s since now we can receive up to 1000 orders from one single request to MabangAPI 2023-07-27 11:09:12 +02:00
Qiuyi LI 8b5311bf84 Release note 1.1.0: Use new MabangAPI and add order archiving job 2023-07-27 11:08:45 +02:00
Gauthier LO e84a825e4f fix: maxRows set to 1000 2023-07-27 11:08:15 +02:00
Gauthier LO 410bae8d5b fix: revert some changes 2023-07-27 11:08:15 +02:00
Gauthier LO 28ec71f50a feature : new Mabang Job to retrieve orders. 2023-07-27 11:08:15 +02:00
Gauthier LO cdf5ce3cb6 fix : archiving job now works as intended, by archiving by default all orders and parcel infos before today 1 year ago 2023-07-27 11:08:15 +02:00
Gauthier LO f453575fb1 feature : - changed list loading logic to include filter 2023-07-27 11:08:15 +02:00
Gauthier LO 723a2ba796 fix: issue in previous merge 2023-07-27 11:08:11 +02:00
Qiuyi LI c049b5adb7 Restore app port and file paths now that old version is no longer running 2023-07-27 11:06:18 +02:00
Qiuyi LI 586e0eddda Feature: makes excluded tracking numbers regex a parameter in ArchiveOrderJob 2023-07-27 11:06:14 +02:00
Qiuyi LI fa0df9450b Fix: convert order time in the database from GMT+8 to GMT+2 to avoid searching mismatch 2023-07-27 11:04:28 +02:00
Qiuyi LI 7ba520eb3f Add missing CMK job 2023-07-27 11:04:16 +02:00
Qiuyi LI a074f6afa8 Update project version 2023-07-27 10:34:30 +02:00
Qiuyi LI 1d99d3c372 Fix: When checking SQL injections, make sure that the tested string's length also matches keyword's length, otherwise a perfectly normal table name "country" will be considered as SQL injection suspect because it starts with "count" 2023-07-27 10:28:21 +02:00
Gauthier LO 78a70c0e8c feature : Job that archives po, poc, parcel, parcel_traces 
fix : orders with empty logistic_channel_name were not displayed in invoicing page with manual selection
 2023-07-27 10:28:21 +02:00
Qiuyi LI d9286f5181 Exclude WIA API calls from JWT filter 2023-07-27 10:28:21 +02:00