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

100 Commits (f2ff97b1d3d0abc64e5f2812dfd2cdea58b55013)

Author SHA1 Message Date
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 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
Gauthier LO cd4ad1e5fe feature : Making Shipping invoice in breakdown page + zip files and email 2023-08-21 12:45:04 +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
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
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 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
Gauthier LO d2ddab74a1 feature: cancel invoice 
fix : orders invoiced twice
 2023-08-01 12:09:02 +02:00
Qiuyi LI 72f433d7b5 Hotfix: Add missing shipping invoice number checks anywhere necessary 2023-07-31 16:43:14 +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 7896883f11 fix: maxRows set to 1000 2023-07-06 17:04:32 +02:00
Gauthier LO cfce37e758 fix: revert some changes 2023-07-06 16:34:35 +02:00
Gauthier LO f1acfa3a3d feature : new Mabang Job to retrieve orders. 2023-07-06 16:15:48 +02:00
Gauthier LO 5b108d9ec6 fix : archiving job now works as intended, by archiving by default all orders and parcel infos before today 1 year ago 2023-07-06 16:13:27 +02:00
Gauthier LO f1473e1d94 feature : - changed list loading logic to include filter 2023-07-06 16:11:18 +02:00
Gauthier LO a4a96e4a8a fix: issue in previous merge 2023-07-04 14:15:37 +02:00
Gauthier LO 8004443d2a merge with dev 2023-07-04 12:14:07 +02:00
Gauthier LO 3f327a22c3 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-04 11:58:53 +02:00
Qiuyi LI ccd36caf72 Restore app port and file paths now that old version is no longer running 2023-07-04 11:41:41 +02:00
Qiuyi LI 76bf080344 Feature: makes excluded tracking numbers regex a parameter in ArchiveOrderJob 2023-07-04 11:10:56 +02:00
Qiuyi LI 7f9b143971 Fix: convert order time in the database from GMT+8 to GMT+2 to avoid searching mismatch 2023-06-30 10:40:54 +02:00
Qiuyi LI c61b5e373c Add missing CMK job 2023-06-30 10:34:26 +02:00
Gauthier LO 7953e9df2c feature: (WIP) archiving job for po, poc, parcel and parcel_trace 2023-06-19 16:14:21 +02:00
Gauthier LO 1c0eec21fa feat : new pages (sav_refund, shipping_calculation, billable_orders_breakdown), warehouses implementation 2023-06-14 11:37:39 +02:00
Gauthier LO fafd549d61 prod config file updated 2023-05-26 12:41:28 +02:00
Gauthier LO f501c314b6 Feat : upgrade from jeecg boot version 3.5 2023-05-26 11:59:13 +02:00
zhangdaiscott d81fa1f908 新增用户的时候设置租户无效 2023-03-15 11:34:26 +08:00
zhangdaiscott 217fe0dce4 租户邀请人改成采用手机号，租户敏感接口加权限 2023-03-15 11:34:20 +08:00
zhangdaiscott fffa7f327b 简化职位录入，职位编码自动生成 2023-03-15 11:34:11 +08:00
zhangdaiscott 5417f1285a 多租户实现逻辑功能不完善问题 #4676 2023-03-13 16:12:18 +08:00
zhangdaiscott a68f304307 补充逻辑，登录加载权限，加上租户套餐权限配置 2023-03-09 12:06:55 +08:00
zhangdaiscott e90efbb52f 解决bug，导入部门是否叶子值不对 2023-03-09 12:06:04 +08:00
zhangdaiscott 42eedcd3b3 系统接口加了权限注解@RequiresPermissions未授权会提示无权限，暂时注释掉 
(无奈的修改，因为太多人问没权限的问题，请注重安全的项目，自行打开注解)
 2023-03-07 13:37:02 +08:00