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
liqianjin
8674f1125c
v1.1.2 合并至github项目
2023-08-10 11:34:43 +08:00
c07bdda87f
fixed product variables
2023-07-19 09:29:50 +08:00
df96ffafa5
!151 后台商品添加model和quantity 列表直接修改上下架状态
...
* cursor-pointer
* admin products-list add switch to edit status
* ProductResource add model and quantity
2023-07-18 16:52:46 +08:00
9529d68d38
Publish JD product.
2023-07-18 16:52:46 +08:00
7f585d6b51
Show product detail on panel.
2023-07-07 17:35:39 +08:00
9287e0fc47
fixed summary rule
2023-06-13 15:33:34 +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
9ecf31aecd
!120 Add sorting settings
...
* Fixed category sort order and filter by active.
* Add sorting settings
2023-06-07 07:55:43 +00:00
2b7b0a9011
!119 add ms hook
...
* wip
* 优化
* wip
* 文件管理器
* add ms hook
2023-06-07 02:57:07 +00:00
f98c93f099
Modify upload max size to 10240 for admin panel.
2023-06-01 11:06:47 +08:00
fc609a9b67
Code format
2023-05-31 18:06:14 +08:00
liqianjin
b57dcf54b0
v1.1 修改完成
2023-05-30 15:29:52 +08:00
liqianjin
66d08c1654
v1 修改完成
2023-05-30 11:56:47 +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
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
619523c472
update tax rate rule
2023-05-23 10:43:21 +08:00
1574805a5a
change order total service and code format.
2023-05-18 15:31:11 +08:00
204d91e5d0
!100 Fix the error reported when there is no data in advanced filtering
...
* Fix the error reported when there is no data in advanced filtering
2023-05-17 03:28:33 +00:00
8ea52fb8ff
!101 Fix article TDK and modify article
...
* Fix article-related product issues
* Fix the problem that the article TDK does not display
2023-05-17 03:27:35 +00:00
d2a68741d4
!94 Fix advanced filter save error
...
* Fix advanced filter save error
2023-05-12 02:33:05 +00:00
f26e239668
fixed position
2023-05-11 15:11:02 +08:00
8fcd26dcd7
Fixed for https://gitee.com/beikeshop/beikeshop/issues/I70XJW?from=project-issue
2023-05-10 09:59:22 +08:00
10eb858ef1
update header and sidebar menus for admin panel.
...
fixed menus
wip
wip
get sub menus
wip
add current link
wip
fixed rma
fixed routes
fixed sub routes
wip
wip
fixed order and rmas
重构后台菜单
wip
fixed active
update languages.
wip
wip
add history links
code format
wip
fixed menus
fixed menus
fixed url
fixed sub routes
wip
update menus
wip
修复角色页面没有选中上一级目录
remove unnecessary code
wip
wip
fixed header common links
code format
add design
fixed plugin
wip
添加插件二次子菜单
修复获取更多
修复最近浏览记录 插件相关语言包
wip
调整文章菜单顺序
fixed common links
fixed common links
wip
wip
wip
default link icon.
修复插件编辑二级菜单选中
wip
wip
wip
wip
wip
wip
2023-05-04 17:48:52 +08: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
920689fbee
首页统计改为产品总数
2023-04-26 18:57:49 +08:00
76b37ed867
!86 Optimization Advanced filters, taxes, currencies, etc.
...
* Fix region configuration province selection problem
* Optimization Advanced filters, taxes, currencies, etc.
2023-04-26 08:38:24 +00:00
a3470b27c0
sort order for file manager
...
wip
wip
sort order by name
2023-04-17 21:00:05 +08:00
98e962a6fd
!79 Fix the background brand page turning back problem, optimize the form submission interaction, etc.
...
* Fix the background brand page turning back problem, optimize the form …
2023-04-11 07:40:23 +00:00
d8027054bc
!77 Optimize setting background page properties
...
* Optimize setting background page properties
2023-04-10 06:06:35 +00:00
5c4ae14dbc
Code format
2023-04-07 16:53:18 +08:00
e1e3ee9568
!75 编辑商品时重量为空保存报错
...
* 代码规范化
* Fix the issue of saving error when editing product weight is empty.
* 高级筛选哪些属性显示在筛选栏可在后台系统设置里设置
2023-04-07 08:42:56 +00: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
b8889cb9c5
Add plugin uninstall reminder
...
wip
Fix navigation responsiveness issues
brand ui
Fix delete attribute call error api
Optimize plugin when uninstall and check plugin is available for current version.
wip
Fix the loading error of the element language file in the homepage editor
Fix menu page category name getting error
Fix menu page category name getting error ++
2023-03-24 11:38:12 +08:00
3de48b35de
Fixed zip open function
2023-03-18 22:20:17 +08:00
e61c9a6def
错误处理
...
wip
2023-03-17 17:02:13 +08:00
5831ea962d
Fixed trashed products.
2023-03-17 11:30:16 +08: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
7e934151f0
Optimize brand.
2023-03-16 09:38:19 +08:00
024a2190f2
admin form add hook
...
optimize brands
Optimize page and category hook
2023-03-16 09:01:29 +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
8ab99143b9
Support own OpenAI API Key
...
Support own OpenAI API Key
fixed openai
check public cache permision when install
check public cache permision when install
Fixed user id
Fixed user id
Fixed api
wip
wip
API Key
wip
fixed openai
2023-03-13 18:59:07 +08:00
7bf19e2c92
Fixed price in product list.
2023-03-13 15:41:46 +08:00
d84393b237
fixed plugin pagination and sidebar
2023-03-10 14:27:54 +08:00
e907a1adae
fixed pagination for plugin list
2023-03-10 09:59:58 +08:00
liqianjin
Edward Yang
宋良辰
pushuo
mengwb