diff --git a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php index f0d0fba21..b193fbb35 100755 --- a/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php +++ b/packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php @@ -278,7 +278,7 @@ class SmartButtonController extends Controller { $cart = Cart::getCart(); - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; if (! $cart->checkMinimumOrder()) { throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php index 985500dd4..34bdbbae0 100644 --- a/packages/Webkul/Sales/src/Config/system.php +++ b/packages/Webkul/Sales/src/Config/system.php @@ -52,7 +52,7 @@ return [ 'name' => 'minimum_order_amount', 'title' => 'admin::app.admin.system.minimum-order-amount', 'type' => 'text', - 'validation' => 'numeric', + 'validation' => 'decimal', 'channel_based' => true, 'locale_based' => true, ], diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index f3abafb3e..f7e2e17ba 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -74,6 +74,14 @@ class OnepageController extends Controller return redirect()->route('customer.session.index'); } + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + + if (! $cart->checkMinimumOrder()) { + session()->flash('warning', trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); + + return redirect()->back(); + } + Cart::collectTotals(); return view($this->_config['view'], compact('cart')); @@ -228,7 +236,7 @@ class OnepageController extends Controller { $cart = Cart::getCart(); - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; if (! $cart->checkMinimumOrder()) { throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)])); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index f14a10383..a035cfc53 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -129,7 +129,7 @@ @if (! cart()->hasError()) @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; @endphp {{ __('shop::app.minicart.view-cart') }} @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; @endphp @{{ errors.first('password_confirmation') }} -
- subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif> - {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} -
+ @if (core()->getConfigData('customer.settings.newsletter.subscription')) +
+ subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif> + {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} +
+ @endif {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!} diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php index 9f1598a08..72f74bd86 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php @@ -76,10 +76,12 @@ Checkbox Value 1 --}} -
- - {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} -
+ @if (core()->getConfigData('customer.settings.newsletter.subscription')) +
+ + {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} +
+ @endif {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!} diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php index 380e61e1e..b370637c7 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php @@ -59,6 +59,10 @@ class ShopController extends Controller { $slug = request()->get('category-slug'); + if (! $slug) { + abort(404); + } + switch ($slug) { case 'new-products': case 'featured-products': diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php index 50324e0bc..bcde1fe6e 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php @@ -104,12 +104,14 @@ -
  • - - - {{ __('shop::app.header.wishlist') }} - -
    • + @if (core()->getConfigData('general.content.shop.wishlist_option')) +
  • + + + {{ __('shop::app.header.wishlist') }} + +
    • + @endif
  • diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php index 50fb7be86..00b0a0d95 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php @@ -46,7 +46,7 @@
    @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + $minimumOrderAmount = core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; @endphp
    -
    - subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif style="width: auto;"> - {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} -
    + @if (core()->getConfigData('customer.settings.newsletter.subscription')) +
    + subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif style="width: auto;"> + {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} +
    + @endif {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!} diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php index 82039e381..bc5dfbd1b 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php @@ -138,10 +138,12 @@ -
    - - {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} -
    + @if (core()->getConfigData('customer.settings.newsletter.subscription')) +
    + + {{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }} +
    + @endif {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!} diff --git a/public/installer/Seeder.php b/public/installer/Seeder.php index a28739b25..aeb1b2bd6 100755 --- a/public/installer/Seeder.php +++ b/public/installer/Seeder.php @@ -1,21 +1,41 @@ &1'; -$seeder = 'cd ../.. && '. $phpbin .' artisan db:seed 2>&1'; -$publish = 'cd ../.. && '. $phpbin .' artisan vendor:publish --all --force 2>&1'; +/* commands sequence */ +$commands = [ + 'seeder' => [ + 'key' => 'seeder_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan db:seed 2>&1' + ], + 'publish' => [ + 'key' => 'publish_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan vendor:publish --all --force 2>&1' + ], + 'storage_link' => [ + 'key' => 'storage_link_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan storage:link 2>&1' + ], + 'key' => [ + 'key' => 'key_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan key:generate 2>&1' + ], + 'optimize' => [ + 'key' => 'optimize_results', + 'command' => 'cd ../.. && '. $phpbin .' artisan optimize 2>&1' + ], +]; -$key_output = exec($key, $data['key'], $data['key_results']); -$seeder_output = exec($seeder, $data['seeder'], $data['seeder_results']); -$publish = exec($publish, $data['publish'], $data['publish_results']); +// run command on terminal +$data = []; +foreach ($commands as $key => $value) { + exec($value['command'], $data[$key], $data[$value['key']]); +} // return a response -//return all our data to an AJAX call - +// return all our data to an AJAX call echo json_encode($data); diff --git a/public/installer/Views/migration.blade.php b/public/installer/Views/migration.blade.php index 4bdb26b2e..d503e545f 100644 --- a/public/installer/Views/migration.blade.php +++ b/public/installer/Views/migration.blade.php @@ -91,13 +91,13 @@

    Populating the database tables

    - +
     
    - +
    - +