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

1145 Commits (d6090138d8c47b94cf155dcfae26450fb4d39d5b)

Author SHA1 Message Date
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
Qiuyi LI d51549c2db Minor code optimization 2023-08-21 11:14:57 +02:00
Gauthier LO 555e697633 Merge branch 'feature/breakdownInvoice' of github.com:LQYBill/wia_app into feature/breakdownInvoice 2023-08-17 16:26:53 +02:00
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
Gauthier LO 314a4b7ac4 feature: (WIP) Invoicing in breakdown page 2023-08-17 09:52:00 +02:00
Qiuyi LI 00914ac93e
Merge pull request #20 from LQYBill/dev 
Release 1.5.0
 2023-08-09 14:08:55 +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 984707043a
Merge pull request #17 from LQYBill/dev 
Release of 1.3.0
 2023-08-02 18:00:12 +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