github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,135 Commits
4 Branches
71 Tags
161 MiB
Commit Graph

153 Commits (8e881edd54f1e0299fab4cf85ad613da34a0e11f)

Author SHA1 Message Date
Qiuyi LI 8e881edd54 Add allstatus parameter when platformIds field is present in Mabang requests 2024-01-26 16:38:21 +01:00
Qiuyi LI b821e7f51b Use the latest Shopify API (upgrade from 2022-10 to 2024-01) 2024-01-26 16:35:40 +01:00
Qiuyi LI 316e4b1c67 Update Order model 2024-01-26 16:33:06 +01:00
Qiuyi LI f863a876aa Update Shop model 2024-01-26 16:27:58 +01:00
Gauthier LO c64bed04ee fix : reintroduce PDF in breakdownInvoice + conditional balance update 
feature : SkuAssociationToClientJob
 2024-01-12 16:10:00 +01:00
Gauthier LO 7c02621910 fix : typo 2024-01-11 15:02:09 +01:00
Gauthier LO 3fdf1d27eb fix : handle not initialized balance error and uninvoiced purchase fees orders 2024-01-11 11:41:01 +01:00
Gauthier LO f6518e327e
Update InvoiceController.java 
notification dest
 2024-01-10 12:10:47 +01:00
Gauthier LO 0795f245c2 fix : added enum to describe invoice status and product availability 2024-01-10 11:57:59 +01:00
Gauthier LO be558d5c9a fix : display shipping invoiced orders with invoiceable purchase fees + replace purchaseOrder status with paidAmount 2024-01-10 11:38:16 +01:00
Qiuyi LI 52969ecd7c
Merge pull request #47 from LQYBill/fix/PurchaseOrder 
fix : better purchase status + better job name display
 2024-01-08 14:43:13 +01:00
Gauthier LO 6f05d8c1bb fix : better purchase status + better job name display 
feature :client invoicing internal use
 2024-01-08 12:23:09 +01:00
Qiuyi LI 5b0e4afe42
Merge pull request #45 from LQYBill/release 
Merge hotfix 1.8.2 to dev
 2024-01-05 12:10:31 +01:00
Gauthier LO bbbf298825
Update ShippingInvoiceController.java 
cleanup convertToPdf function not deleted during merge
 2024-01-05 09:41:57 +01:00
Qiuyi LI daecbead81
Update ShippingInvoiceController.java 2024-01-04 17:12:32 +01:00
Gauthier LO b426e836ed
Merge branch 'dev' into feature/creditPage 2024-01-04 16:29:23 +01:00
Gauthier LO 67cb86e25b feature : feature : Self-service invoicing rework + Purchase Order Registration Page + ShippingFeeBillableNotificationJob 2024-01-04 15:57:15 +01:00
Gauthier LO b2a8e88559 feature : feature : (WIP)Self-service invoicing rework + Purchase Order Registration Page + SkuShippingQtyJob 2023-12-08 17:39:59 +01:00
Qiuyi LI ca7be03720 Add parcel trace translation for HL 2023-11-27 14:55:53 +01:00
Qiuyi LI 6ac3ce6bf6 Create YPJob 2023-11-21 15:22:21 +01:00
Qiuyi LI 09bcd7938c Refactor HLJob to make it possible to change request URL 2023-11-21 15:22:01 +01:00
Gauthier LO b718a23b9c feature : confirmed clients invoicing job 2023-11-15 15:31:26 +01:00
Qiuyi LI 1c0403fcf8
Merge pull request #38 from LQYBill/release 
Merge release to dev
 2023-11-14 15:12:16 +01:00
Qiuyi LI 140997994a Replace old algo by new algo 2023-11-14 14:26:05 +01:00
Qiuyi LI 0c57d68a12 Validate tests with improvement in case of two 40cm canvases and 50cm canvases 2023-11-14 14:20:23 +01:00
Qiuyi LI a2f27094c3 Create a new method for finding adequate tubes and a main to test for regression 2023-11-13 16:10:22 +01:00
Gauthier LO 6978554075 fix2 : credit editing now correctly updates balance + allow only editing of last credit per currency 2023-10-31 14:29:19 +01:00
Gauthier LO 1efb88c7a1 feature : VipInvoicingJob + (WIP) client category 2023-10-30 15:26:36 +01:00
Qiuyi LI 43b31e5e9a Hotfix: Update CWJob API key and secret to retrieve parcel traces of another YDH account 2023-10-25 11:40:04 +02:00
Gauthier LO cd924ce2d1 feature : (WÏP) credit Page + balance + invoicing 2023-10-13 14:38:36 +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 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 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 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 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 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
Qiuyi LI 9d2697affa Use classpath loader for FreeMarker template 2023-08-25 11:33:12 +02:00
Qiuyi LI 8da45dce22 Code optimization 2023-08-24 14:03:32 +02:00
Gauthier LO dc4d67fcf8 fix: shipping fee calculation precision 2023-08-22 17:34:03 +02:00