wuhui_zzw
3c62e8af7d
优化：商品编辑增加按件卖（默认）/按批卖设置
2023-09-20 16:37:49 +08:00
wuhui_zzw
b679d66adb
版本合并、和客户修改后的版本合并
...
修改：商品编辑页面取消sku；起订量从规格中移除，统一设置起订量
修改：客服端显示最小起订量
2023-09-20 13:36:57 +08:00
wuhui_zzw
cf7825d519
优化：文本内容修改
2023-08-31 11:34:22 +08:00
wuhui_zzw
f55c520015
添加：物流管理 - 商品详情页面支持切换国家和物流；并且同步刷新对应的运费
2023-08-28 15:15:44 +08:00
wuhui_zzw
3c96766442
添加：物流管理 - 添加前台默认展示国家
2023-08-25 14:16:09 +08:00
wuhui_zzw
1dd22c3e02
文字替换：Add buy sku 修改为Quantity；Product Total 修改为 Quantity total
2023-08-25 09:48:53 +08:00
wuhui_zzw
270623a9ad
优化：物流信息添加默认单位
2023-08-22 16:19:58 +08:00
wuhui_zzw
18546a254c
添加：物流运费计算方式
2023-08-22 16:00:34 +08:00
wuhui_zzw
f1f2a7d1bf
修改：物流列表显示内容优化
2023-08-21 18:05:03 +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
8750c828f7
!155 Add hooks for cart and checkout page submit buttons
...
* fixed license
* add setting license_code
* Add hooks for cart and checkout page submit buttons
2023-07-18 16:52:46 +08:00
5b262df391
Fixed openai and added plugin version.
2023-06-19 19:07:43 +08:00
391f28ede7
!132 Delete the background vip button and change it to License & Services
...
* Delete the background vip button and change it to License & Services
2023-06-14 06:46:23 +00: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
fc609a9b67
Code format
2023-05-31 18:06:14 +08:00
liqianjin
66d08c1654
v1 修改完成
2023-05-30 11:56:47 +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
89adc4d8d1
Code format
2023-05-10 11:52:19 +08:00
8fcd26dcd7
Fixed for https://gitee.com/beikeshop/beikeshop/issues/I70XJW?from=project-issue
2023-05-10 09:59:22 +08:00
77bf0bca1a
Change plugin purchase process
...
wip
wip
wip
wip
admin ui optimization
Optimize file manager
2023-05-09 17:53:11 +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
e1e3ee9568
!75 编辑商品时重量为空保存报错
...
* 代码规范化
* Fix the issue of saving error when editing product weight is empty.
* 高级筛选哪些属性显示在筛选栏可在后台系统设置里设置
2023-04-07 08:42:56 +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
12600ee14e
code format
2023-03-24 11:39:40 +08: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
a30c12d86d
Update default theme
2023-03-16 15:47:13 +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
87a37d6252
Optimize plugin types.
...
wip
wip
wip
Code format
2023-03-08 14:54:44 +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
ac217f36ed
修改词条
2023-03-08 12:17:50 +08:00
571eba695d
权限管理 添加插件权限
2023-03-08 12:17:50 +08:00
c988b851a8
调整配置到数据库存放
2023-02-22 03:51:54 +00:00
e0c2acc630
优化后台 vip 到期时间显示
...
wip
wip
2023-02-19 10:11:59 +08:00
f0d3762b66
Code format
2023-02-18 14:32:05 +08:00
13e46886a8
完善多語言
...
多语言优化
词条优化
2023-02-15 14:22:49 +08:00
0307831081
完善多语言, 修复后台文章列表页标题截取问题
2023-02-14 17:23:38 +08:00
cd0136c892
商品管理词条 客户列表优化
...
修复非中文input框单独一行
补全词条
文章分类词条
后台用户编辑页样式优化
修復文章分類多語言
词条-内容管理
内容管理
去掉content
属性组词条
非中文input样式优化
2023-02-14 17:01:25 +08:00
85edc96d41
code format
2023-02-10 21:56:20 +08:00
wuhui_zzw
liqianjin
pushuo
Edward Yang
mengwb
nilsir
songliang