diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php
index c09e2b97..e9da4e9f 100644
--- a/beike/Admin/Providers/AdminServiceProvider.php
+++ b/beike/Admin/Providers/AdminServiceProvider.php
@@ -19,6 +19,7 @@ use Beike\Admin\View\Components\Form\InputLocale;
use Beike\Admin\View\Components\Form\RichText;
use Beike\Admin\View\Components\Form\Select;
use Beike\Admin\View\Components\Form\SwitchRadio;
+use Beike\Admin\View\Components\Form\SwitchRadioStatus;
use Beike\Admin\View\Components\Form\Textarea;
use Beike\Admin\View\Components\Header;
use Beike\Admin\View\Components\NoData;
@@ -139,6 +140,7 @@ class AdminServiceProvider extends ServiceProvider
'alert' => Alert::class,
'form-input-locale' => InputLocale::class,
'form-switch' => SwitchRadio::class,
+ 'form-switch-status' => SwitchRadioStatus::class,
'form-input' => Input::class,
'form-select' => Select::class,
'form-image' => Image::class,
diff --git a/beike/Admin/View/Components/Form/SwitchRadioStatus.php b/beike/Admin/View/Components/Form/SwitchRadioStatus.php
new file mode 100644
index 00000000..099670a0
--- /dev/null
+++ b/beike/Admin/View/Components/Form/SwitchRadioStatus.php
@@ -0,0 +1,26 @@
+name = $name;
+ $this->title = $title;
+ $this->value = $value;
+ }
+
+ public function render()
+ {
+ return view('admin::components.form.switch-radio-status');
+ }
+}
diff --git a/beike/Shop/Http/Controllers/CartController.php b/beike/Shop/Http/Controllers/CartController.php
index 4b8b261e..29521e1b 100644
--- a/beike/Shop/Http/Controllers/CartController.php
+++ b/beike/Shop/Http/Controllers/CartController.php
@@ -61,7 +61,7 @@ class CartController extends Controller
$customer = current_customer();
$sku = ProductSku::query()
- ->whereRelation('product', 'active', '=', true)
+ // ->whereRelation('product', 'active', '=', true)
->findOrFail($skuId);
$cart = CartService::add($sku, $quantity, $customer);
diff --git a/beike/Shop/Http/Controllers/CheckoutController.php b/beike/Shop/Http/Controllers/CheckoutController.php
index c5fc22d3..959c2824 100644
--- a/beike/Shop/Http/Controllers/CheckoutController.php
+++ b/beike/Shop/Http/Controllers/CheckoutController.php
@@ -57,7 +57,14 @@ class CheckoutController extends Controller
public function confirm()
{
try {
- $data = (new CheckoutService)->confirm();
+ $checkoutService = new CheckoutService;
+ $selectedProducts = $checkoutService->selectedProducts->toArray();
+ foreach($selectedProducts as $product){
+ if($product['product']['active'] == FALSE){
+ return json_fail(trans('common.product_active_false'));
+ }
+ }
+ $data = $checkoutService->confirm();
return hook_filter('checkout.confirm.data', $data);
} catch (\Exception $e) {
diff --git a/plugins/LatestProducts/Controllers/MenusController.php b/plugins/LatestProducts/Controllers/MenusController.php
index 02295409..44fd5e19 100644
--- a/plugins/LatestProducts/Controllers/MenusController.php
+++ b/plugins/LatestProducts/Controllers/MenusController.php
@@ -29,7 +29,7 @@ class MenusController extends Controller
{
$products = ProductRepo::getBuilder(
[
- 'active' => 1,
+ // 'active' => 1,
'sort' => 'created_at',
'order' => 'desc',
])
diff --git a/resources/beike/admin/views/components/form/switch-radio-status.blade.php b/resources/beike/admin/views/components/form/switch-radio-status.blade.php
new file mode 100644
index 00000000..a91567a7
--- /dev/null
+++ b/resources/beike/admin/views/components/form/switch-radio-status.blade.php
@@ -0,0 +1,13 @@
+