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
bb7a6aad0d
!161 Fix page summary input error prompt
...
* Fix installation error and no information display problem
* Fix page summary input error prompt
2023-07-20 06:22:35 +00: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
530e5f22fe
!138 Fix pagination button h5 responsive
...
* Fix pagination button h5 responsive ++
* Fix pagination button h5 responsive
* Optimize table UI, etc
2023-06-19 02:27:08 +00: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
1cbf9af4a4
optimize fail status
2023-06-13 15:26:07 +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
fc609a9b67
Code format
2023-05-31 18:06:14 +08:00
liqianjin
6395744c56
v1.2 修改完成
2023-05-31 11:59:54 +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
b5cc1ba786
!104 Product Added Quick Preview
...
* Added quick preview
2023-05-20 10:20:53 +00:00
1574805a5a
change order total service and code format.
2023-05-18 15:31:11 +08:00
812b7655af
!98 Optimize the personal center button, etc.
...
* wip
* Optimize the personal center button, etc.
* wip
* wip
* wip
* Modify an entry, name -> full name
2023-05-15 10:15:27 +00:00
b88d889861
!97 Modify an entry, name -> full name
...
* Modify an entry, name -> full name
2023-05-15 06:18:25 +00:00
9d020adaee
!96 韩语支持
...
* 删除文件 resources/lang/ko/.keep
* 韩语4
* 韩语3
* 新建 admin
* 韩语2
* 韩语
* 新建 ko
2023-05-14 12:32:44 +00:00
b595085b7e
!92 Optimize the checkout process
...
* wip
* wip
* wip
* wip
* wip
* wip
* Optimize the checkout process
2023-05-10 10:37:27 +00:00
89adc4d8d1
Code format
2023-05-10 11:52:19 +08:00
6636986904
admin test
2023-05-10 10:53:55 +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
2956a536ff
fixed Indonesia
2023-04-26 14:31:53 +08:00
4e5fe381b4
add lang id
2023-04-26 14:19:24 +08: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
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
ebc96147c5
Import demo data
2023-03-16 15:49:40 +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
575469ca3d
修复游客结账地址丢失国家
2023-03-01 09:48:22 +08:00
532057689b
词条优化
2023-02-27 10:35:15 +00:00
c85a5b7575
词条优化
2023-02-27 10:35:15 +00:00
liqianjin
pushuo
Edward Yang
Teemo
licy@guangda.work
mengwb
songliang