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
99f87cc9e6
修复多个模板重复加载相同hook导致的问题
2023-07-19 11:36:53 +08:00
b23a926dd5
修复切换不同模板产生模板缓存导致DIY问题
2023-07-19 09:45:32 +08:00
2d28ca8e68
add product repo builder
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
05da652822
!121 优化
...
* 代码优化
2023-06-08 03:23:35 +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
fc609a9b67
Code format
2023-05-31 18:06:14 +08:00
liqianjin
b57dcf54b0
v1.1 修改完成
2023-05-30 15:29:52 +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
1574805a5a
change order total service and code format.
2023-05-18 15:31:11 +08:00
f4657a9bed
Fixed breadcrumb for page detail
2023-05-17 11:19:33 +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
e7734f2551
!82 商品搜索支持以空格间隔的多个词组
...
* The product search supports multiple strings separated by spaces.
2023-04-17 16:32:47 +08:00
19f15b54a8
Fixed page category pagenation
2023-04-07 17:22:34 +08: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
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
cfc922ae46
Fix the issue of creating an order failure caused by the guest checkout address ID being an empty string (should be an integer).
...
wip
2023-03-17 11:42:25 +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
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
7eb8fe3477
Code format
2023-03-09 16:58:51 +08:00
56f17772ca
optimization getListByProductIds
2023-03-09 16:23:56 +08:00
1527721142
Fixed getOrderByIdOrNumber if customer is null or guest customer.
2023-03-09 11:44:01 +08:00
b023ee7a1c
Fixed disabled plugin for home module.
2023-03-08 15:42:11 +08:00
8933cbbdd4
Bestseller module plugin for home page designer
...
支持首页模块插件化
bestseller
wip
wip
Optimize module view path.
wip
Fixed module content
Optimize module view path.
wip
wip
Optimize module view path.
2023-03-08 12:20:53 +08:00
68aacec7d4
update order shipment
...
优化发货信息修改
wip
wip
发货信息可以编辑
2023-03-01 11:50:17 +08:00
575469ca3d
修复游客结账地址丢失国家
2023-03-01 09:48:22 +08:00
43c7a5461e
修复禁用分类问题 https://guangdagit.com/projects/bk_mundosanjose/issues/8
2023-02-27 09:53:00 +08:00
688d4f42d3
code format
2023-02-21 12:44:12 +08:00
3ff13b3c70
优化setting 保存json
2023-02-21 10:26:37 +08:00
7e972a8723
添加文章分类相关功能
...
优化链接配置词条
文章分类状态默认修改
wip
wip
2023-02-10 21:50:38 +08:00
65c65a11fb
添加订单和产品hook
2023-02-07 09:51:01 +08:00
6eeeea11cc
自动读取主题
2023-02-06 17:15:38 +08:00
8451c0b819
后台商品详情多规格批量设置等
2023-02-03 12:00:35 +08:00
e00ad4f241
去除筛选页分类限制
2023-02-03 12:00:35 +08:00
9579ae8c08
修复前台选择每页数量后翻页问题
2023-02-03 12:00:35 +08:00
b61c8cf9b6
product autocomplate搜索关键字使用包含条件
2023-02-03 12:00:35 +08:00
7e569330d7
代码格式优化
2023-01-13 15:51:49 +08:00
d0aeeb522b
删除属性时检查是否有商品使用
...
删除商品时删除商品分、商品相关、商品sku、商品属性、商品描述
2023-01-13 03:27:08 +00:00
liqianjin
Edward Yang
pushuo
mengwb
tim