wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,398 Commits 5 Branches 0 Tags 49 MiB
Commit Graph

1317 Commits

Author SHA1 Message Date
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
pushuo 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
pushuo 2b12969d3a !160 Fix the front-end error reporting problem when the page is deleted 
* wip
* Fix the front-end error reporting problem when the page is deleted
 2023-07-20 10:16:36 +08:00
Edward Yang d8b9be889c upgrade to v1.3.8(20230719) 2023-07-19 18:38:18 +08:00
Edward Yang 99f87cc9e6 修复多个模板重复加载相同hook导致的问题 2023-07-19 11:36:53 +08:00
Edward Yang b23a926dd5 修复切换不同模板产生模板缓存导致DIY问题 2023-07-19 09:45:32 +08:00
Edward Yang c07bdda87f fixed product variables 2023-07-19 09:29:50 +08:00
Edward Yang a1ba2917f8 Fixed category seo url on category - product list page. 2023-07-18 19:35:48 +08:00
Edward Yang def439de4d release v1.3.8 - 20230718 2023-07-18 16:53:50 +08:00
pushuo 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
Edward Yang 41ba00a3b3 code format 2023-07-18 16:52:46 +08:00
mengwb 3063e764f9 !153 所有model统一继承BASE 
* model统一继承BASE
 2023-07-18 16:52:46 +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
Edward Yang 1a3b7d134f Code format 2023-07-18 16:52:46 +08:00
Edward Yang 2d28ca8e68 add product repo builder 2023-07-18 16:52:46 +08:00
mengwb d0c4bc77e7 !150 安装环境检测 
* installer detect the php extension
 2023-07-18 16:52:46 +08:00
pushuo 69e9a051c1 !149 Fix configuration link status disabled and display problems 
* wip
* wip
* Fix configuration link status disabled and display problems -> https:/…
 2023-07-18 16:52:46 +08:00
Edward Yang f72b61a4a3 Fixed checkout for null sku https://gitee.com/beikeshop/beikeshop/issues/I7D59N?from=project-issue 2023-07-18 16:52:46 +08:00
Edward Yang 33784ebbdb 支持 blade hook 循环体传值 2023-07-18 16:52:46 +08:00
Edward Yang e1a4d1b3cc 修复 blade hook 优先级被覆盖导致插件失效 2023-07-18 16:52:46 +08:00
Edward Yang 9529d68d38 Publish JD product. 2023-07-18 16:52:46 +08:00
Edward Yang 5649d40560 Code format 2023-07-18 16:52:46 +08:00
Edward Yang 7e3ee84096 Export csv 2023-07-18 16:52:46 +08:00
Edward Yang 754ddb58a4 fixed validate database 2023-07-18 16:52:46 +08:00
Edward Yang 7f585d6b51 Show product detail on panel. 2023-07-07 17:35:39 +08:00
Edward Yang 2704c42f71 Update build to 20230621 2023-06-21 14:13:40 +08:00
Edward Yang fe0c328c76 update build 2023-06-19 16:25:08 +08:00
pushuo 4cffc1a159 !136 navigation add news 
* navigation add news
 2023-06-14 10:14:44 +00:00
Edward Yang 473ed35cd9 update build 2023-06-14 09:07:32 +08:00
Edward Yang 2c460d696e update version to 1.3.7 2023-06-13 15:43:47 +08:00
Edward Yang 9287e0fc47 fixed summary rule 2023-06-13 15:33:34 +08:00
Edward Yang 1cbf9af4a4 optimize fail status 2023-06-13 15:26:07 +08:00
Edward Yang 2ea6cdd49b Optimize checkout confirm. 2023-06-13 15:20:38 +08:00
pushuo 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
mengwb 05da652822 !121 优化 
* 代码优化
 2023-06-08 03:23:35 +00:00
Edward Yang 130a4544cc Show SPU image for product list 2023-06-07 19:23:37 +08:00
pushuo 9ecf31aecd !120 Add sorting settings 
* Fixed category sort order and filter by active.
* Add sorting settings
 2023-06-07 07:55:43 +00:00
pushuo 2b7b0a9011 !119 add ms hook 
* wip
* 优化
* wip
* 文件管理器
* add ms hook
 2023-06-07 02:57:07 +00:00
pushuo fb1c2e4c1c !118 order detail for guest 
* order ui
* fixed guest order
* add number filter
* Add order detail for guest
 2023-06-07 02:03:07 +00:00
mengwb 0a5518d801 !116 结账hook 
* Optimize cart list.
* 结账优化
 2023-06-06 00:43:20 +00:00
Edward Yang d935eb4ff3 Optimize cart list. 2023-06-05 16:21:39 +08:00
mengwb fdbe7120c0 !113 hook优化 
* hook优化
 2023-06-05 03:19:49 +00:00
mengwb 25fd03c3c7 !112 service.checkout.update.after hook 
* service.checkout.update.after
 2023-06-02 10:08:18 +00:00
Edward Yang 0c18aedbb1 revert code to redirect to cart. 2023-06-02 17:33:22 +08:00
Edward Yang 65f8023891 Thrown cart exception. 2023-06-02 17:10:41 +08:00
Edward Yang 6a16540d1b Fixed flexshipping for 1.3.6 and 1.3.7 2023-06-02 16:18:42 +08:00
Edward Yang a29245b5d4 Fixed flex service. 2023-06-02 14:38:45 +08:00
pushuo fb8ac8dea4 !111 facebook pixel 
* remove account order success.
* wip
* fb-pixel
 2023-06-02 01:18:43 +00:00
Edward Yang f98c93f099 Modify upload max size to 10240 for admin panel. 2023-06-01 11:06:47 +08:00