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
41ba00a3b3
code format
2023-07-18 16:52:46 +08:00
3063e764f9
!153 所有model统一继承BASE
...
* model统一继承BASE
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
e7019a9722
!123 Add video function
...
* Optimize shopping cart entries
* File manager selection type judgment
* video function
* Support video for file manager
* Optimize file manager
2023-06-09 05:58:33 +00:00
2b7b0a9011
!119 add ms hook
...
* wip
* 优化
* wip
* 文件管理器
* add ms hook
2023-06-07 02:57:07 +00:00
liqianjin
b57dcf54b0
v1.1 修改完成
2023-05-30 15:29:52 +08:00
liqianjin
18a314f357
修改
2023-05-29 20:02:32 +08:00
liqianjin
bb57d646db
修改
2023-05-29 19:59:31 +08:00
liqianjin
5e552c572e
init
2023-05-27 11:47:26 +08:00
d6f518dff6
!107 Order Payment
...
* wip
* add exceptions
* order->orderPayments ui
* add order payments
* paypal 和 stripe 保存支付数据
* add order payment.
2023-05-25 09:53:49 +00:00
c1d6c48f5b
Add jwt and admin token to build API.
...
Add jwt to build API.
返回当前客户
后台添加，通过token获取后台用户信息
fixed token api
fixed order list and order detail
fixed product api
fixed categoryies API
add brands
fixed brands
add products
添加订单接口
2023-04-27 18:16:07 +08:00
67d1b85952
admin adds a token
...
wip
fixed update
fixed account update
wip
wip
wip
wip
fixed tokens
wip
admin token
2023-04-27 18:16:07 +08:00
a3470b27c0
sort order for file manager
...
wip
wip
sort order by name
2023-04-17 21:00:05 +08:00
f744dc6b02
!84 调整代码
...
* Merge branch 'dev' of https://gitee.com/what520/beikeshop into dev
* 增加hook,实现插件中要求的其他订单状态显示
* 调整状态字段的显示字段，与后端的一致
* 增加
2023-04-17 16:32:47 +08: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
9fe36070c1
add new theme fashion
...
wip
wip
wip
wip
admin form add hook
Code format
优化插件市场返回上一页
Update openai migration
optimize brands
Optimize page and category hook
模版优化
delete black
wip
Plublish theme files.
Ignore themes except default
删除demo-2
wip
Get enabled themes.
Theme seeder.
Run theme seeder.
update theme
wip
wip
Switch theme and run db seeder
code format
wip
wip
2023-03-16 15:25:45 +08:00
a75d795098
Refactor url link and label for brand、page and page category.
2023-03-15 15:19:25 +08:00
68231b0538
Refactor url link and label.
2023-03-15 14:55:00 +08:00
88255f6e7b
Use Product::getUrlAttribute to get product url.
2023-03-14 21:13:03 +08:00
87a37d6252
Optimize plugin types.
...
wip
wip
wip
Code format
2023-03-08 14:54:44 +08:00
68aacec7d4
update order shipment
...
优化发货信息修改
wip
wip
发货信息可以编辑
2023-03-01 11:50:17 +08:00
43c7a5461e
修复禁用分类问题 https://guangdagit.com/projects/bk_mundosanjose/issues/8
2023-02-27 09:53:00 +08:00
c988b851a8
调整配置到数据库存放
2023-02-22 03:51:54 +00:00
b4586bd452
自动更新汇率, 并显示在后台汇率列表
2023-02-22 03:51:54 +00:00
0b118df670
fixed plugin types
2023-02-21 15:47:49 +08:00
5566633370
修复状态机库存减扣
2023-02-13 19:14:03 +08:00
7e972a8723
添加文章分类相关功能
...
优化链接配置词条
文章分类状态默认修改
wip
wip
2023-02-10 21:50:38 +08:00
9fe2b28655
添加 Order::subTotal 和 Order::getNextStatuses 方法
2023-02-07 15:26:49 +08:00
100333d56f
优化 masterSku 命名
2023-01-12 15:46:53 +08:00
434d94c01d
使用laravel/pint格式化代码
2023-01-10 14:38:26 +08:00
81013aaeb0
修改 meta_keyword 为 meta_keywords
2023-01-06 18:43:36 +08:00
6e8d7f295f
相关商品功能
2023-01-06 15:51:30 +08:00
1613adc3fa
商品属性功能后端代码
2023-01-06 11:41:38 +08:00
2b8cbdf1ac
游客结账后端部分
2023-01-05 15:12:46 +08:00
f26cbaf0dd
适配到店自提功能添加一些hook
2022-12-30 10:41:07 +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
548405a983
订单增加payment_country_id, payment_zone_id, shipping_country_id, shipping_zone_id
2022-12-22 14:39:59 +08:00
88160552c4
后台订单状态管理 发货快递单号添加
...
添加订单邮编
添加订单邮编
前后台订单详情页添加地址邮编
添加发货单号
优化订单详情页 添加快递公司配置
fixed shipment
发货功能
fixed order shippment
添加前后台订单详情发货信息
优化后台快递公司配置
fixed order shipment
修改 express_company 为 express_code
add code
发货设置
2022-12-21 14:23:33 +08:00
97f3db810a
清理后台分类数据
2022-11-11 14:50:03 +08:00
315c31b5bd
后台订单筛选，前台购物车显示SKU 规格名称
2022-11-04 14:07:16 +08:00
0e17f523e2
fixed keyword and type filter
2022-10-14 17:21:43 +08:00
8f22790abd
修改注释版权
2022-09-13 23:07:51 +08:00
c3c94acaff
售后服务
2022-08-31 18:08:47 +08:00
3c1ffdc0f8
优化后台多语言
2022-08-30 17:01:48 +08:00
5c233f1bc5
后台国家省份管理
2022-08-30 16:26:32 +08:00
1596c985b8
fixed tax
2022-08-29 18:23:03 +08:00
9b6d341ba2
order information languages
2022-08-29 16:41:18 +08:00
28f8655a92
修复订单货币
2022-08-29 14:57:13 +08:00
b9b2ef7525
创建成功后订单变为未支付 支付成功后减扣库存
2022-08-26 16:35:05 +08:00
liqianjin
Edward Yang
mengwb
pushuo
what_村长
nilsir
Edward Yang
TL
pushuo