EShop

Commit Graph

Select branches

Hide Pull Requests

abp-7.4

dependabot/npm_and_yarn/samples/EShopSample/aspnet-core/src/EShopSample.Web/lodash-4.17.23

dependabot/npm_and_yarn/samples/EShopSample/aspnet-core/src/EShopSample.Web/sweetalert2-11.22.4

dev

master

release

#103

#107

#108

#112

#113

#116

#117

#119

#122

#126

#127

#128

#129

#130

#131

#132

#137

#142

#143

#146

#148

#149

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#170

#171

#172

#173

#177

#178

#179

#180

#184

#185

#186

#187

#189

#190

#193

#194

#195

#197

#198

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#210

#211

#212

#213

#216

#217

#219

#220

#222

#223

#224

#226

#227

#228

#229

#230

#231

#232

#233

#235

#236

#237

#239

#240

#241

#242

#244

#245

#251

#252

#253

#254

#255

#256

#257

#258

#259

#260

#261

#262

#265

#266

#267

#268

#269

#270

#271

#272

#274

#275

#276

#277

#278

#280

#281

#283

#283

#284

#287

#289

#291

#292

#292

#293

#294

#294

#295

#296

#297

#297

#49

#57

#58

#67

#81

#87

#87

#96

#99

0.10.0

0.11.0

0.12.0

0.13.0

0.13.1

0.14.0

0.14.1

0.8.0

0.8.1

0.8.2

0.8.3

0.8.4

0.8.5

0.8.6

0.9.0

0.9.1

0.9.3

1.0.0

1.0.1

1.1.0

1.2.0

1.3.0

1.3.1

1.3.2

1.4.0

1.4.1

1.5.0

1.6.0

1.6.1

1.6.2

1.7.0

1.8.0

1.8.1

1.8.2

1.8.3

1.9.0

2.0.0

2.1.0

2.1.1

2.1.2

2.1.3

2.1.4

2.1.5

2.1.6

2.1.7

2.1.8

2.2.0

2.2.1

2.2.2

2.2.3

2.2.4

2.2.5

2.2.6

2.2.7

2.3.0

2.3.1

2.3.2

2.4.0

2.4.1

2.4.2

2.4.3

2.4.4

2.5.0

2.6.0

2.7.0

2.8.0

2.8.1

2.9.0

2.9.1

2.9.2

2.9.3

3.0.0

3.0.0-preview.1

3.0.0-preview.10

3.0.0-preview.11

3.0.0-preview.12

3.0.0-preview.13

3.0.0-preview.14

3.0.0-preview.15

3.0.0-preview.16

3.0.0-preview.17

3.0.0-preview.18

3.0.0-preview.19

3.0.0-preview.2

3.0.0-preview.20

3.0.0-preview.3

3.0.0-preview.4

3.0.0-preview.5

3.0.0-preview.6

3.0.0-preview.7

3.0.0-preview.8

3.0.0-preview.9

3.1.0

3.2.0

3.3.0

3.3.1

3.3.2

3.4.0

3.5.0

3.6.0

3.6.1

4.0.0

4.0.0-preview.1

4.0.0-preview.2

4.0.0-preview.3

4.0.0-preview.4

4.0.0-preview.5

4.0.0-preview.6

4.1.0

4.2.0

4.3.0

4.4.0

5.0.0

5.0.0-preview.1

5.0.0-preview.2

5.0.0-preview.3

5.0.0-preview.4

5.0.0-preview.5

5.0.1

5.0.2

5.1.0

5.2.0

5.3.0

5.4.0

5.5.0

5.6.0

5.7.0

5.8.0

5.8.0-preview.1

5.9.0

v0.1.19

v0.1.20

v0.2.0

v0.2.1

v0.2.2

v0.2.3

v0.2.4

v0.2.5

v0.2.6

v0.2.7

v0.3.1

v0.3.2

v0.3.3

v0.3.4

v0.3.5

v0.3.6

v0.3.7

v0.3.8

v0.4.0

v0.4.1

v0.4.2

v0.4.3

v0.4.4

v0.4.5

v0.4.6

v0.4.7

v0.4.8

v0.5.0

v0.5.1

v0.5.2

v0.6.0

220406c3b8

Merge 00163cd3b2 into 068cb62404 #297 dependabot[bot] 2026-01-22 00:14:37 +0000
00163cd3b2

Bump lodash in /samples/EShopSample/aspnet-core/src/EShopSample.Web #297 dependabot/npm_and_yarn/samples/EShopSample/aspnet-core/src/EShopSample.Web/lodash-4.17.23 dependabot[bot] 2026-01-22 00:14:34 +0000
44d4943973 Update LeptonX packages master gdlcf88 2025-12-20 19:06:55 +0800
34283f4a04

Merge be25da3ba3 into 068cb62404 #292 slarkerino 2025-12-20 03:05:17 +0800
ec915f49c9

Merge f444cb6d58 into 068cb62404 #87 Raymond Sun 2025-12-20 03:05:17 +0800
068cb62404

Merge pull request #296 from EasyAbp/abp-10 dev 5.9.0 Super 2025-12-20 03:05:07 +0800
9e09607d06 Upgrade to ABP 10.0.1 #296 gdlcf88 2025-12-20 03:04:11 +0800
7765e068e6

Merge 06db094366 into 6fdfbd77dd #294 dependabot[bot] 2025-09-09 20:00:21 +0000
06db094366

Bump sweetalert2 in /samples/EShopSample/aspnet-core/src/EShopSample.Web #294 dependabot/npm_and_yarn/samples/EShopSample/aspnet-core/src/EShopSample.Web/sweetalert2-11.22.4 dependabot[bot] 2025-09-09 20:00:19 +0000
6fdfbd77dd

Merge pull request #295 from EasyAbp/abp-9.3 5.8.0 Super 2025-09-10 03:58:58 +0800
5d6f70cf08 Upgrade to ABP 9.3.3 #295 gdlcf88 2025-09-10 03:57:14 +0800
14e370a7b6 Fix typo in the code 5.8.0-preview.1 gdlcf88 2025-07-18 16:54:34 +0800
9a2a75defa Improve the management page UI gdlcf88 2025-07-18 16:40:02 +0800
58a011fce2

Merge pull request #293 from EasyAbp/abp-9.2 5.7.0 Super 2025-07-02 02:04:04 +0800
76b9621666 Upgrade to ABP 9.2.1 #293 gdlcf88 2025-07-02 02:02:01 +0800
be25da3ba3 fix：add permission check when payment userId not match #292 slarkerino 2025-04-17 10:52:24 +0800
20647e1857 fix: 修复付款单权限 slarkerino 2025-04-16 22:37:42 +0800
288943156c

Merge pull request #291 from EasyAbp/abp-9.1 5.6.0 Super 2025-03-31 17:53:36 +0800
4e9623236d Upgrade to ABP 9.1.1 #291 gdlcf88 2025-03-31 17:52:08 +0800
f1d253d6d3

Merge pull request #289 from EasyAbp/abp-9.0 5.5.0 Super 2024-12-29 23:06:04 +0800
3dc672ce65 Upgrade to ABP 9.0.2 #289 gdlcf88 2024-12-29 23:05:34 +0800
c6d04f2c89 Fix UTs 5.4.0 gdlcf88 2024-10-28 03:16:18 +0800
b791b76fe9

Upgrade to ABP 8.3.2 (#287) Super 2024-10-28 02:58:36 +0800
85675e7d87 Fix UTs #287 gdlcf88 2024-10-28 02:58:04 +0800
d1528b708b Upgrade to ABP 8.3.2 gdlcf88 2024-10-28 02:48:34 +0800
eeedf08a62

Unit test: Order using coupons discount (#281) 张志炜 2024-08-08 14:49:51 +0800
7a5017889b

Merge pull request #284 from EasyAbp/abp-8.2 5.3.0 Super 2024-07-30 23:23:02 +0800
752940fb58 Upgrade to ABP 8.2.0 #284 gdlcf88 2024-07-30 23:22:29 +0800
0fe50113f0

Merge f20cc7d12b into 10eaf9f002 #283 张志炜 2024-07-08 14:28:00 +0800
f20cc7d12b SetPaid 和 StartPaymentAsync 都是 internal 导致重写了2个事件，无法调用这些方法。或许，可以给个重写方法？ #283 张志炜 2024-07-08 14:24:51 +0800
a0f24034f4 english annotation #281 张志炜 2024-06-19 13:50:33 +0800
10eaf9f002

Merge pull request #280 from EasyAbp/fix-GetOrderLinesInScope Super 2024-06-19 14:04:41 +0900
f5e79e5ab2 Change version to 5.3.0-preview.1 #280 gdlcf88 2024-06-19 14:03:13 +0900
5f751b464d Avoid using Unscoped coupons regardless of the amount gdlcf88 2024-06-19 14:00:30 +0900
70ed31ce80 修复CouponType注释张志炜 2024-06-19 10:28:28 +0800
f8fee8d0c9 优惠券类型测试张志炜 2024-06-19 09:34:28 +0800
a52aa4cc1e

Merge pull request #278 from EasyAbp/abp8.1 5.2.0 Super 2024-05-19 18:01:15 +0800
ed155ba90b Upgrade to ABP 8.1.3 #278 gdlcf88 2024-05-19 18:00:11 +0800
98b0058b27 Upgrade to ABP 8.1.0 gdlcf88 2024-04-15 05:26:36 +0800
3dfdbabe48

Bump es5-ext in /samples/EShopSample/aspnet-core/src/EShopSample.Web #277 dependabot[bot] 2024-02-27 10:56:16 +0000
6dda9a4f2e Fix `DbMigratorHostedService` gdlcf88 2023-12-28 00:48:38 +0800
d9103f3d79

Merge pull request #276 from EasyAbp/abp-8.0 5.1.0 Super 2023-12-27 21:30:30 +0800
574dcf73de Upgrade to ABP 8.0.0 #276 gdlcf88 2023-12-27 21:29:34 +0800
4d00d92796 Fix namespace using 5.0.2 gdlcf88 2023-12-26 14:13:27 +0800
7c70e7cc88 Remove the `Volo.Abp.Identity.Application.Contracts` package gdlcf88 2023-12-26 14:00:23 +0800
848b358fec Upgrade to PaymentService module v2.9.1 5.0.1 gdlcf88 2023-11-04 17:39:57 +0800
90e287ac24

Merge pull request #275 from EasyAbp/payment-service-2.9 5.0.0 Super 2023-11-01 00:18:59 +0800
3658f40a79 Upgrade to PaymentService module v2.9.0 and release EShop 5.0.0 #275 gdlcf88 2023-11-01 00:17:49 +0800
e0fddfb254 Update publish.yml 4.4.0 release abp-7.4 gdlcf88 2023-10-20 00:42:17 +0800
2aadbb8d93 Change version to 4.4.0 gdlcf88 2023-10-20 00:41:37 +0800
401c7c0741

Merge pull request #274 from EasyAbp/eshop5-abp7.4 5.0.0-preview.5 Super 2023-10-20 00:40:21 +0800
89cad822c2 Change version to 5.0.0-preview.5 #274 gdlcf88 2023-10-20 00:40:02 +0800
cc7334f9a8 Merge branch 'abp-7.4' into eshop5-abp7.4 gdlcf88 2023-10-20 00:39:02 +0800
77218f18b6 Upgrade to ABP 7.4.0 gdlcf88 2023-10-20 00:34:05 +0800
52a64ceb3a

Merge pull request #272 from EasyAbp/fix-wrong-payment-amount 5.0.0-preview.4 Super 2023-09-09 19:36:56 +0800
bb56a1531c Change version to 5.0.0-preview.4 #272 gdlcf88 2023-09-09 19:36:43 +0800
fc1b14a33c Fix wrong `PaymentAmount` values gdlcf88 2023-09-09 19:35:17 +0800
e5be38a85f Move menu items to Administration gdlcf88 2023-08-21 19:07:28 +0800
bfa34d75ef

Merge pull request #271 from EasyAbp/upgrade-modules 5.0.0-preview.3 Super 2023-08-03 18:58:44 +0800
98928e8a26 Upgrade dependent modules #271 gdlcf88 2023-08-03 18:58:18 +0800
3390c40e54

Merge pull request #270 from EasyAbp/on-completed Super 2023-08-03 17:17:59 +0800
e710f15271 Use `IServiceScopeFactory` on UOW completed #270 gdlcf88 2023-08-03 17:01:49 +0800
9c1a014b23

Merge pull request #269 from EasyAbp/refund-appservice-payment-id 5.0.0-preview.2 Super 2023-07-29 17:47:34 +0800
12cb0dd9f7 Add `GetRefundListDto.PaymentId` #269 gdlcf88 2023-07-29 17:47:08 +0800
77a50a1fd5

Merge pull request #268 from EasyAbp/order-and-refund 5.0.0-preview.1 Super 2023-07-29 16:33:49 +0800
a21b3fdfa2 Introduce `PaymentAmount` to validate refund amounts #268 gdlcf88 2023-07-29 16:32:39 +0800
dbfba5223c Change version to 4.3.0 4.3.0 gdlcf88 2023-07-25 03:41:53 +0800
98727a0a5f

Merge pull request #267 from EasyAbp/abp-7.3 Super 2023-07-25 03:40:31 +0800
310b6546ce Upgrade to ABP 7.3.0 #267 gdlcf88 2023-07-25 03:39:50 +0800
6af000972e

Bump semver in /samples/EShopSample/aspnet-core/src/EShopSample.Web #266 dependabot[bot] 2023-07-12 20:07:01 +0000
baff218252 Change version to 4.2.0 4.2.0 gdlcf88 2023-05-28 21:36:58 +0800
476b539105

Merge pull request #265 from EasyAbp/fix-product-to-product-view-mapping Super 2023-05-28 21:35:59 +0800
7ef4fa8750 Fix the Product to ProductView mapping #265 gdlcf88 2023-05-28 21:03:53 +0800
bbafeb1d80 Fix UTs 4.1.0 gdlcf88 2023-05-04 16:54:00 +0800
de866cd7ef

Merge pull request #262 from EasyAbp/abp7.2.1 Super 2023-05-04 15:55:56 +0800
3cdccbe5ea Upgrade to ABP 7.2.1 #262 gdlcf88 2023-05-04 15:55:33 +0800
a8ea43ac0e Change version to 4.0.0 4.0.0 gdlcf88 2023-04-21 23:02:26 +0800
487f7aaf41

Merge pull request #261 from EasyAbp/promotions-docs Super 2023-04-21 22:53:20 +0800
002b58f277 Update README.md #261 gdlcf88 2023-04-21 22:52:31 +0800
d86db7a705 Docs for Promotions module and sample app improvements gdlcf88 2023-04-21 22:44:33 +0800
067f32e2de

Merge pull request #260 from EasyAbp/order-discount-uts Super 2023-04-21 19:44:25 +0800
9dcdfa33ce Fix a bug of the order discount and create UTs #260 gdlcf88 2023-04-21 19:36:06 +0800
f446284437 Change version to 4.0.0-preview.6 4.0.0-preview.6 gdlcf88 2023-04-18 03:14:34 +0800
196712c413

Merge pull request #259 from EasyAbp/batch-discount-products Super 2023-04-18 03:13:54 +0800
fccaeab2e7 Batch discount products to improve performance #259 gdlcf88 2023-04-18 03:13:30 +0800
a91a3a14a0

Merge pull request #258 from EasyAbp/fix-order-ef-including 4.0.0-preview.5 Super 2023-04-17 17:35:24 +0800
dfe025a28b Add the missing OrderDiscounts EF Core relationship loading #258 gdlcf88 2023-04-17 17:34:09 +0800
6da72221a6 Add public setter to `RuleData` gdlcf88 2023-04-16 01:21:10 +0800
73d1e3e714 Change version to 4.0.0-preview.4 4.0.0-preview.4 gdlcf88 2023-04-16 00:32:28 +0800
d8e4cf0bad

Merge pull request #257 from EasyAbp/i-order-discount Super 2023-04-16 00:30:53 +0800
678c4b7198 Introduce `IOrderDiscount` #257 gdlcf88 2023-04-16 00:30:01 +0800
8ea9563813 Fix the Product to ProductView mapping 4.0.0-preview.3 gdlcf88 2023-04-15 23:57:12 +0800
1456c8de63 Fix UT `Should_Add_Order_Candidate_Discount_Preview` 4.0.0-preview.2 gdlcf88 2023-04-15 23:19:19 +0800
9ac4301ca1

Merge pull request #256 from EasyAbp/rule-data Super 2023-04-15 23:11:48 +0800
9f7caf736c Add `RuleData` in OrderDiscountPreviewInfoModel #256 gdlcf88 2023-04-15 23:10:30 +0800
0b93d60ee1 Fix namespaces 4.0.0-preview.1 gdlcf88 2023-04-15 21:16:21 +0800
c42707ab74 Change version to 4.0.0-preview.1 gdlcf88 2023-04-15 21:09:36 +0800
2a72ec30a7

Merge pull request #240 from EasyAbp/plugins-promotions Super 2023-04-15 21:07:11 +0800
e289ac4d7b Complete the Promotions plugin module #240 gdlcf88 2023-04-15 21:06:09 +0800
b6631b56b0 Merge branch 'dev' into plugins-promotions gdlcf88 2023-04-15 20:55:26 +0800