merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into issue-4119 

Merged
This commit is contained in:
devansh bawari 2020-11-20 10:27:34 +05:30
parent 8a5c6dc6b8 dfccdc3463
commit 561d598ae8
50 changed files with 229 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php
View File

@ -168,17 +168,13 @@ class CheckoutController extends Controller
*/
public function checkMinimumOrder()
{
$cart = Cart::getCart();
$cartBaseSubTotal = (float) $cart->base_sub_total;
$minimumOrderAmount = (float) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
$status = $cartBaseSubTotal > $minimumOrderAmount;
$status = Cart::checkMinimumOrder();
return response()->json([
'status' => ! $status ? false : true,
'message' => ! $status ? trans('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) : 'Success',
'message' => ! $status ? trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) : 'Success',
'data' => [
'cart' => new CartResource($cart),
]

52
packages/Webkul/Admin/src/Http/Middleware/Locale.php Normal file
View File

@ -0,0 +1,52 @@
<?php
namespace Webkul\Admin\Http\Middleware;
use Webkul\Core\Repositories\LocaleRepository;
use Closure;
class Locale
{
/**
* @var LocaleRepository
*/
protected $locale;
/**
* @param \Webkul\Core\Repositories\LocaleRepository $locale
*/
public function __construct(LocaleRepository $locale)
{
$this->locale = $locale;
}
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$locale = request()->get('admin_locale');
if ($locale) {
if ($this->locale->findOneByField('code', $locale)) {
app()->setLocale($locale);
session()->put('admin_locale', $locale);
}
} else {
if ($locale = session()->get('admin_locale')) {
app()->setLocale($locale);
} else {
app()->setLocale(app()->getLocale());
}
}
unset($request['admin_locale']);
return $next($request);
}
}

2
packages/Webkul/Admin/src/Http/routes.php
View File

@ -1,6 +1,6 @@
<?php
Route::group(['middleware' => ['web']], function () {
Route::group(['middleware' => ['web', 'admin_locale']], function () {
Route::prefix(config('app.admin_url'))->group(function () {
Route::get('/', 'Webkul\Admin\Http\Controllers\Controller@redirectToLogin');

6
packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
View File

@ -3,6 +3,8 @@
namespace Webkul\Admin\Providers;
use Illuminate\Support\ServiceProvider;
use Illuminate\Routing\Router;
use Webkul\Admin\Http\Middleware\Locale;
use Webkul\Core\Tree;
class AdminServiceProvider extends ServiceProvider
@ -12,7 +14,7 @@ class AdminServiceProvider extends ServiceProvider
*
* @return void
*/
public function boot()
public function boot(Router $router)
{
$this->loadRoutesFrom(__DIR__ . '/../Http/routes.php');
@ -29,6 +31,8 @@ class AdminServiceProvider extends ServiceProvider
$this->registerACL();
$router->aliasMiddleware('admin_locale', Locale::class);
$this->app->register(EventServiceProvider::class);
}

36
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -16,6 +16,42 @@
<span class="avatar">
</span>
<?php $locale = request()->get('admin_locale') ?: app()->getLocale();?>
<div class="profile-info">
<div class="dropdown-toggle">
<div style="display: inline-block; vertical-align: middle;">
<span class="name">
{{ __('admin::app.datagrid.locale') }}
</span>
@foreach (core()->getAllLocales() as $localeModel)
@if ($localeModel->code == $locale)
<span class="role">
{{ $localeModel->name }}
</span>
@endif
@endforeach
</div>
<i class="icon arrow-down-icon active"></i>
</div>
<div class="dropdown-list bottom-right">
<div class="control-group">
<select class="control" id="locale-switcher" onChange="window.location.href = this.value" style="margin-left: 30px;">
@foreach (core()->getAllLocales() as $localeModel)
<option value="{{ '?admin_locale=' . $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
{{ $localeModel->name }}
</option>
@endforeach
</select>
</div>
</div>
</div>
<div class="profile-info">
<div class="dropdown-toggle">
<div style="display: inline-block; vertical-align: middle;">

4
packages/Webkul/Attribute/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Attribute\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Attribute\Models\Attribute::class,

4
packages/Webkul/BookingProduct/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\BookingProduct\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\BookingProduct\Models\BookingProduct::class,

4
packages/Webkul/CMS/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\CMS\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\CMS\Models\CmsPage::class,

4
packages/Webkul/CartRule/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\CartRule\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\CartRule\Models\CartRule::class,

4
packages/Webkul/CatalogRule/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\CatalogRule\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\CatalogRule\Models\CatalogRule::class,

4
packages/Webkul/Category/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Category\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Category\Models\Category::class,

24
packages/Webkul/Checkout/src/Cart.php
View File

@ -293,7 +293,7 @@ class Cart
public function getItemByProduct($data)
{
$items = $this->getCart()->all_items;
foreach ($items as $item) {
if ($item->product->getTypeInstance()->compareOptions($item->additional, $data['additional'])) {
if (isset($data['additional']['parent_id'])) {
@ -577,6 +577,8 @@ class Cart
$cart->items_count = $cart->items->count();
$cart->items_qty = $quantities;
$cart->cart_currency_code = core()->getCurrentCurrencyCode();
$cart->save();
@ -607,7 +609,7 @@ class Cart
if ($validationResult->isItemInactive()) {
$this->removeItem($item->id);
$isInvalid = true;
session()->flash('info', __('shop::app.checkout.cart.item.inactive'));
@ -708,7 +710,7 @@ class Cart
$item->save();
}
Event::dispatch('checkout.cart.calculate.items.tax.after', $cart);
}
@ -1275,4 +1277,20 @@ class Cart
}
}
}
/**
* Check minimum order.
*
* @return boolean
*/
public function checkMinimumOrder(): bool
{
$cart = $this->getCart();
if (! $cart) {
return false;
}
return $cart->checkMinimumOrder();
}
}

15
packages/Webkul/Checkout/src/Models/Cart.php
View File

@ -3,7 +3,6 @@
namespace Webkul\Checkout\Models;
use Illuminate\Database\Eloquent\Model;
use Webkul\Product\Models\ProductProxy;
use Webkul\Checkout\Contracts\Cart as CartContract;
class Cart extends Model implements CartContract
@ -169,4 +168,18 @@ class Cart extends Model implements CartContract
return true;
}
/**
* Check minimum order.
*
* @return boolean
*/
public function checkMinimumOrder(): bool
{
$minimumOrderAmount = (float) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
$cartBaseSubTotal = (float) $this->base_sub_total;
return $cartBaseSubTotal >= $minimumOrderAmount;
}
}

4
packages/Webkul/Checkout/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Checkout\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Checkout\Models\Cart::class,

29
packages/Webkul/Core/src/Providers/CoreModuleServiceProvider.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace Webkul\Core\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
class CoreModuleServiceProvider extends BaseModuleServiceProvider
{
public function boot()
{
if ($this->areMigrationsEnabled()) {
$this->registerMigrations();
}
if ($this->areModelsEnabled()) {
$this->registerModels();
$this->registerEnums();
$this->registerRequestTypes();
}
if ($this->areViewsEnabled()) {
$this->registerViews();
}
if ($routes = $this->config('routes', true)) {
$this->registerRoutes($routes);
}
}
}

4
packages/Webkul/Core/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,7 @@
namespace Webkul\Core\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Core\Models\Channel::class,

4
packages/Webkul/Customer/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Customer\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Customer\Models\Customer::class,

4
packages/Webkul/Inventory/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Inventory\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Inventory\Models\InventorySource::class,

2
packages/Webkul/Paypal/src/Providers/EventServiceProvider.php
View File

@ -15,7 +15,7 @@ class EventServiceProvider extends ServiceProvider
* @return void
*/
public function boot()
{
{
Event::listen('bagisto.shop.layout.body.after', static function(ViewRenderEventManager $viewRenderEventManager) {
$viewRenderEventManager->addTemplate('paypal::checkout.onepage.paypal-smart-button');
});

2
packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
View File

@ -1,4 +1,4 @@
@if (request()->route()->getName() == 'shop.checkout.onepage.index')
@if (request()->route()->getName() == 'shop.checkout.onepage.index' && core()->getConfigData('sales.paymentmethods.paypal_smart_button.active'))
<script src="https://www.paypal.com/sdk/js?client-id={{core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id')}}" data-partner-attribution-id="Bagisto_Cart"></script>
<style>

4
packages/Webkul/Product/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Product\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Product\Models\Product::class,

4
packages/Webkul/Sales/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Sales\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Sales\Models\Order::class,

2
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=f9b25f1c2f22de85711d",
"/js/shop.js": "/js/shop.js?id=fd3e9e2c897df46dd84c",
"/css/shop.css": "/css/shop.css?id=45a1e46876af32f30871"
}

4
packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
View File

@ -230,8 +230,8 @@ class OnepageController extends Controller
$minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
if (! ($cart->base_sub_total > $minimumOrderAmount)) {
throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]));
if (! $cart->checkMinimumOrder()) {
throw new \Exception(trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]));
}
if ($cart->haveStockableItems() && ! $cart->shipping_address) {

11
packages/Webkul/Shop/src/Resources/assets/js/components/checkout/proceed-to-checkout.vue
View File

@ -9,24 +9,17 @@ export default {
'addClass',
'text',
'cartDetails',
'minimumOrderAmount',
'isMinimumOrderCompleted',
'minimumOrderMessage'
],
methods: {
checkMinimumOrder: function (e) {
let base_sub_total = parseFloat(this.getCartDetails().base_sub_total);
let minimumOrderAmount = parseFloat(this.minimumOrderAmount);
if (! (base_sub_total > minimumOrderAmount)) {
if (! this.isMinimumOrderCompleted) {
e.preventDefault();
window.flashMessages = [{'type': 'alert-warning', 'message': this.minimumOrderMessage}];
this.$root.addFlashMessages();
}
},
getCartDetails: function () {
return JSON.parse(this.cartDetails);
}
}
}

2
packages/Webkul/Shop/src/Resources/lang/ar/app.php
View File

@ -498,7 +498,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/de/app.php
View File

@ -492,7 +492,7 @@ return [
'cart-remove-action' => 'Wollen Sie dies wirklich tun?',
'partial-cart-update' => 'Nur einige der Produkte wurden aktualisiert',
'link-missing' => '',
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -498,7 +498,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/es/app.php
View File

@ -464,7 +464,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/fa/app.php
View File

@ -497,7 +497,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

4
packages/Webkul/Shop/src/Resources/lang/it/app.php
View File

@ -17,7 +17,7 @@ return [
'common' => [
'error' => 'Qualcosa è andato storto, per favore prova ancora più tardi.',
'image-upload-limit' => 'La dimensione massima di caricamento dell\'immagine è 2 MB',
'image-upload-limit' => 'La dimensione massima di caricamento dell\'immagine è 2 MB',
'no-result-found' => 'Non abbiamo trovato risultati.'
],
@ -495,7 +495,7 @@ return [
'event' => [
'expired' => 'Questo evento è terminato.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

4
packages/Webkul/Shop/src/Resources/lang/ja/app.php
View File

@ -16,7 +16,7 @@ return [
'common' => [
'error' => 'エラーが発生しました。しばらく待ってから、再度アクセスしてください。',
'image-upload-limit' => '画像の最大アップロードサイズは2MBです',
'image-upload-limit' => '画像の最大アップロードサイズは2MBです',
],
'home' => [
@ -456,7 +456,7 @@ return [
'cart-remove-action' => '手続きを進めますか。',
'partial-cart-update' => 'Only some of the product(s) were updated',
'link-missing' => '',
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

4
packages/Webkul/Shop/src/Resources/lang/nl/app.php
View File

@ -17,7 +17,7 @@ return [
'common' => [
'error' => 'Something went wrong, please try again later.',
'image-upload-limit' => 'De maximale uploadgrootte van de afbeelding is 2 MB',
'image-upload-limit' => 'De maximale uploadgrootte van de afbeelding is 2 MB',
'no-result-found' => 'We could not find any records.'
],
@ -502,7 +502,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

4
packages/Webkul/Shop/src/Resources/lang/pl/app.php
View File

@ -17,7 +17,7 @@ return [
'common' => [
'error' => 'Coś poszło nie tak. Proszę spróbować później.',
'image-upload-limit' => 'Maksymalny rozmiar przesyłanego obrazu to 2 MB',
'image-upload-limit' => 'Maksymalny rozmiar przesyłanego obrazu to 2 MB',
'no-result-found' => 'Nie znaleźliśmy żadnych zapisów.'
],
@ -494,7 +494,7 @@ return [
'event' => [
'expired' => 'To wydarzenie wygasło.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
View File

@ -487,7 +487,7 @@ return [
'event' => [
'expired' => 'This event has been expired.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

2
packages/Webkul/Shop/src/Resources/lang/tr/app.php
View File

@ -495,7 +495,7 @@ return [
'event' => [
'expired' => 'Bu eylemin geçerliliği sona erdi.'
],
'minimum-order-message' => 'Your order should be greater than :amount'
'minimum-order-message' => 'Minimum order amount is :amount'
],
'onepage' => [

5
packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
View File

@ -138,9 +138,8 @@
href="{{ route('shop.checkout.onepage.index') }}"
add-class="btn btn-lg btn-primary"
text="{{ __('shop::app.checkout.cart.proceed-to-checkout') }}"
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}">
</proceed-to-checkout>
@endif
</div>

5
packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
View File

@ -96,9 +96,8 @@
href="{{ route('shop.checkout.onepage.index') }}"
add-class="btn btn-primary btn-lg"
text="{{ __('shop::app.minicart.checkout') }}"
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}"
is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}"
style="color: white;">
</proceed-to-checkout>
</div>

4
packages/Webkul/SocialLogin/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\SocialLogin\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\SocialLogin\Models\CustomerSocialAccount::class,

4
packages/Webkul/Tax/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Tax\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Tax\Models\TaxCategory::class,

4
packages/Webkul/User/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\User\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\User\Models\Admin::class,

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=1b8afaddd07cc3f668b1",
"/js/velocity.js": "/js/velocity.js?id=4ac9d3094b2372ee0b3e",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=d1461e1147981876a7fd"
}

2
packages/Webkul/Velocity/src/Http/admin-routes.php
View File

@ -1,6 +1,6 @@
<?php
Route::group(['middleware' => ['web']], function () {
Route::group(['middleware' => ['web', 'admin_locale']], function () {
Route::prefix(config('app.admin_url') . '/velocity')->group(function () {
Route::group(['middleware' => ['admin']], function () {
Route::namespace('Webkul\Velocity\Http\Controllers\Admin')->group(function () {

4
packages/Webkul/Velocity/src/Providers/ModuleServiceProvider.php
View File

@ -2,9 +2,9 @@
namespace Webkul\Velocity\Providers;
use Konekt\Concord\BaseModuleServiceProvider;
use Webkul\Core\Providers\CoreModuleServiceProvider;
class ModuleServiceProvider extends BaseModuleServiceProvider
class ModuleServiceProvider extends CoreModuleServiceProvider
{
protected $models = [
\Webkul\Velocity\Models\Category::class,

7
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/mini-cart.vue
View File

@ -74,7 +74,7 @@
'checkoutUrl',
'checkoutText',
'subtotalText',
'minimumOrderAmount',
'isMinimumOrderCompleted',
'minimumOrderMessage'
],
@ -122,10 +122,7 @@
},
checkMinimumOrder: function (e) {
let base_sub_total = parseFloat(this.cartInformation.raw.base_sub_total);
let minimumOrderAmount = parseFloat(this.minimumOrderAmount);
if (! (base_sub_total > minimumOrderAmount)) {
if (! this.isMinimumOrderCompleted) {
e.preventDefault();
window.showAlert(`alert-warning`, 'Warning', this.minimumOrderMessage);
}

11
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/proceed-to-checkout.vue
View File

@ -9,23 +9,16 @@ export default {
'addClass',
'text',
'cartDetails',
'minimumOrderAmount',
'isMinimumOrderCompleted',
'minimumOrderMessage'
],
methods: {
checkMinimumOrder: function (e) {
let base_sub_total = parseFloat(this.getCartDetails().base_sub_total);
let minimumOrderAmount = parseFloat(this.minimumOrderAmount);
if (! (base_sub_total > minimumOrderAmount)) {
if (! this.isMinimumOrderCompleted) {
e.preventDefault();
window.showAlert(`alert-warning`, 'Warning', this.minimumOrderMessage);
}
},
getCartDetails: function () {
return JSON.parse(this.cartDetails);
}
}
}

4
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/mini-cart.blade.php
View File

@ -9,7 +9,7 @@
checkout-text="{{ __('shop::app.minicart.checkout') }}"
checkout-url="{{ route('shop.checkout.onepage.index') }}"
subtotal-text="{{ __('shop::app.checkout.cart.cart-subtotal') }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
is-minimum-order-completed="{{ Cart::checkMinimumOrder() }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}">
</mini-cart>
</div>

5
packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php
View File

@ -53,9 +53,8 @@
href="{{ route('shop.checkout.onepage.index') }}"
add-class="theme-btn text-uppercase col-12 remove-decoration fw6 text-center"
text="{{ __('velocity::app.checkout.proceed') }}"
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
is-minimum-order-completed="{{ $cart->checkMinimumOrder() }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) }}">
</proceed-to-checkout>
</div>
</div>