liqianjin
f344d2deab
Merge branch 'github-master' into master-github-histories
...
# Conflicts:
# beike/Admin/View/Components/Header.php
# beike/Admin/View/Components/Sidebar.php
# beike/Helpers.php
# beike/Models/Product.php
# beike/Repositories/OrderRepo.php
# beike/Repositories/PageCategoryRepo.php
# beike/Shop/Services/CartService.php
# composer.lock
# resources/beike/admin/views/components/header.blade.php
# resources/beike/admin/views/pages/design/builder/index.blade.php
# resources/beike/admin/views/pages/marketing/show.blade.php
# resources/beike/admin/views/pages/products/form/form.blade.php
# resources/lang/en/admin/marketing.php
# resources/lang/zh_cn/admin/common.php
# resources/lang/zh_cn/admin/marketing.php
# resources/lang/zh_cn/admin/product.php
# themes/default/cart/mini.blade.php
# themes/default/layout/footer.blade.php
# themes/default/layout/master.blade.php
# themes/default/product/product.blade.php
2023-08-10 13:45:22 +08:00
1a3b7d134f
Code format
2023-07-18 16:52:46 +08:00
f72b61a4a3
Fixed checkout for null sku https://gitee.com/beikeshop/beikeshop/issues/I7D59N?from=project-issue
2023-07-18 16:52:46 +08:00
130a4544cc
Show SPU image for product list
2023-06-07 19:23:37 +08:00
0a5518d801
!116 结账hook
...
* Optimize cart list.
* 结账优化
2023-06-06 00:43:20 +00:00
d935eb4ff3
Optimize cart list.
2023-06-05 16:21:39 +08:00
fdbe7120c0
!113 hook优化
...
* hook优化
2023-06-05 03:19:49 +00:00
25fd03c3c7
!112 service.checkout.update.after hook
...
* service.checkout.update.after
2023-06-02 10:08:18 +00:00
65f8023891
Thrown cart exception.
2023-06-02 17:10:41 +08:00
6a16540d1b
Fixed flexshipping for 1.3.6 and 1.3.7
2023-06-02 16:18:42 +08:00
a29245b5d4
Fixed flex service.
2023-06-02 14:38:45 +08:00
liqianjin
42f66f859a
v1.1.1 修改
2023-06-01 09:56:55 +08:00
8b711fa653
!108 【WIP】代码优化和添加hook(适配多商户)
...
* wip
* 文件管理器优化
* 文件管理器优化
* 后台订单管理和商品管理代码优化，提供更好的扩展性，便于多商家实现
* totalService
* 添加hook
* TotalService优化
* hook
* hook
* 购物车列表hook
2023-05-30 01:56:26 +00:00
liqianjin
bb57d646db
修改
2023-05-29 19:59:31 +08:00
liqianjin
5e552c572e
init
2023-05-27 11:47:26 +08:00
1574805a5a
change order total service and code format.
2023-05-18 15:31:11 +08:00
920689fbee
首页统计改为产品总数
2023-04-26 18:57:49 +08:00
2a2067204a
Add hook for total service.
2023-04-26 11:12:36 +08:00
318d2d9cfa
Fixed customer group discount.
2023-04-12 11:40:56 +08:00
5c4ae14dbc
Code format
2023-04-07 16:53:18 +08:00
d074c123d9
!68 商品重量和多个bug修复
...
* Optimizing Blog ui
* Optimize breadcrumb position, optimize webpack.mix.js
* Modify request vip status update logic
* 后台商品列表默认按修改时间倒序，商品编辑保存无修改时更新商品修改时间
* wip
* wip
* 高级筛选属性多选问题处理
* 修复游客结账问题
* Add payment success page
* After repairing the data loss problem after dragging the order of specifications
* wip
* Fix the problem that the image of the deleted product in the backgroun…
* wip
* wip
* 占位图
* 更改地址重新加载运费，和重新计算order total运费功能
* wip
* wip
* wip
2023-03-31 02:56:57 +00:00
86b3d33d6d
!66 默认属性组不可删除
...
* 默认数据增加id为1的默认属性组，并且默认属性组后台不能删除
* migrations/2023_03_20_091423_product_weight.php
* 商品重量
* add weight blade
* bugfix
* 商品重量，用于计算flex shipping运费；地址变化后配送方式变化，需要重新显示新的配送方式
* Placeholder Image Backend Settings
* 商品重量，用于计算flex shipping运费；地址变化后配送方式变化，需要重新显示新的配送方式
* 增加hook
2023-03-24 10:23:55 +00:00
9ee28acf64
fixed country list
2023-03-24 12:59:35 +08:00
5831ea962d
Fixed trashed products.
2023-03-17 11:30:16 +08:00
aacda723b2
修复游客结账时有缘shippingAddress和Paymentaddress为空导致税没计算出来的问题。
2023-03-16 16:37:44 +08:00
873954614a
Optimize plugin manager
2023-03-08 15:50:52 +08:00
a1b1f6ba15
修复库存问题: 当购物车中商品加上详情页购买商品大于库存时，可下单成功
2023-03-08 12:17:50 +08:00
59bcdb0fda
add filter hook service.payment.pay.data
2023-02-20 18:15:58 +08:00
31f42458fe
修复flexshipping 兼容性
2023-02-15 11:51:11 +08:00
f2d7f76ab9
修复文章查看数为空保存报错
2023-02-11 20:37:07 +08:00
a5191440c6
修复游客结账客户组折扣问题
2023-02-11 09:29:05 +08:00
1276d0a98b
会员组折扣功能
...
客户组编辑释放出折扣率
会员组折扣
客户组折扣
wip
会员组折扣
会员组折扣
2023-02-10 02:39:54 +00:00
0f0ba924ce
获取购物车商品总额
2023-02-08 18:00:05 +08:00
6095b5de23
hook_action 统一命名
2023-02-07 11:19:17 +08:00
65c65a11fb
添加订单和产品hook
2023-02-07 09:51:01 +08:00
c455e5a949
update checkout order confirm
2023-02-06 16:09:51 +08:00
1a23c49f90
售后申请自动取订单的电话号码
...
https://guangdagit.com/beike/beikeshop/issues/268#issuecomment-19073
2023-01-12 15:48:26 +08:00
1f15bbda6f
Code format
2023-01-10 14:54:05 +08:00
434d94c01d
使用laravel/pint格式化代码
2023-01-10 14:38:26 +08:00
15302b3c28
游客结账
2023-01-05 15:12:47 +08:00
2b8cbdf1ac
游客结账后端部分
2023-01-05 15:12:46 +08:00
f26cbaf0dd
适配到店自提功能添加一些hook
2022-12-30 10:41:07 +08:00
03d0ba9b42
添加checkout action_hook
2022-12-28 16:21:38 +08:00
08d951fe90
add action hook
2022-12-28 16:21:38 +08:00
a65caab2f9
添加mail后台配置
...
邮件
邮件设置
no message
set smtp setting
fixed mail template
wip
fixed mail
fixed mail
fixed mail config
wip
wip
add others email template
fixed mail
添加 horizon 面板，采用队列发送邮件
重构邮件发送
是否使用队列后台配置
使用队列发送邮件
customer new order
重构邮件发送
update code
code optimize
wip
wip
wip
是否提醒多语言
优化邮件
wip
wip
订单是否提醒状态更新修改
wkip
wip
fixed email locale
wip
找回密码邮件
wip
修改类名
后台找回密码和验证码邮件
wip
前后台找回密码验证email
后台找回密码
2022-12-26 16:40:34 +08:00
28c9e44ef9
修复下单时配送插件编码报错
2022-12-13 18:31:58 +08:00
bb346ab584
如果配送插件关闭或卸载，则重新计算运费
2022-12-07 17:21:13 +08:00
9bec24b2cb
获取当前货币ID
2022-12-07 17:21:13 +08:00
9451ab57a6
修改固定运费计算
2022-12-07 17:21:13 +08:00
fc496aa4dd
重构结账页total计算
2022-12-07 17:21:13 +08:00
liqianjin
Edward Yang
mengwb