wuhui_zzw
5663f321dc
优化：商品编辑页面布局调整，添加贸易术语设置及相关内容
2023-09-22 15:04:12 +08:00
wuhui_zzw
9ad042da88
优化：商品编辑页面布局调整，计量单位由手动填写且支持中英文切换修改为下拉框选择且不支持中英文切换
2023-09-22 10:39:48 +08:00
wuhui_zzw
b679d66adb
版本合并、和客户修改后的版本合并
...
修改：商品编辑页面取消sku；起订量从规格中移除，统一设置起订量
修改：客服端显示最小起订量
2023-09-20 13:36:57 +08:00
wuhui_zzw
5a83342538
优化：国家选择器 - 添加区域分组筛选
2023-08-31 09:53:08 +08:00
wuhui_zzw
e6882598fe
添加：物流添加续重范围填写项
2023-08-28 17:45:59 +08:00
wuhui_zzw
3c96766442
添加：物流管理 - 添加前台默认展示国家
2023-08-25 14:16:09 +08:00
wuhui_zzw
4032cfaaa1
优化：国家支持图标设置
2023-08-25 11:08:31 +08:00
wuhui_zzw
afa9b0be6f
修改：物流支持多国家选择
2023-08-21 16:59:20 +08:00
liqianjin
02516b7825
【增加】物流及可视化
2023-08-12 18:46:10 +08:00
liqianjin
bfb1ea283c
【增加】物流管理
2023-08-11 18:41:28 +08:00
liqianjin
4f1beb97d9
【增加】视频播放装修
...
【增加】复制商品
【增加】商品长宽高参数
【增加】合并到第三方主版本分支，更新到最新版本
2023-08-11 13:55:00 +08:00
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
9ecf31aecd
!120 Add sorting settings
...
* Fixed category sort order and filter by active.
* Add sorting settings
2023-06-07 07:55:43 +00:00
fc609a9b67
Code format
2023-05-31 18:06:14 +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
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
d2a68741d4
!94 Fix advanced filter save error
...
* Fix advanced filter save error
2023-05-12 02:33:05 +00: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
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
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
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
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
571eba695d
权限管理 添加插件权限
2023-03-08 12:17:50 +08:00
68aacec7d4
update order shipment
...
优化发货信息修改
wip
wip
发货信息可以编辑
2023-03-01 11:50:17 +08:00
1b1fbf3a4c
添加后台客户管理 hook
2023-02-21 17:32:15 +08:00
f0d3762b66
Code format
2023-02-18 14:32:05 +08:00
wuhui_zzw
liqianjin
pushuo
Edward Yang
mengwb