diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index 3b334b2ab..dccbe614a 100644
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -323,6 +323,14 @@ Route::group(['middleware' => ['web']], function () {
'redirect' => 'admin.locales.index'
])->name('admin.locales.store');
+ Route::get('/locales/edit/{id}', 'Webkul\Core\Http\Controllers\LocaleController@edit')->defaults('_config', [
+ 'view' => 'admin::settings.locales.edit'
+ ])->name('admin.locales.edit');
+
+ Route::put('/locales/edit/{id}', 'Webkul\Core\Http\Controllers\LocaleController@update')->defaults('_config', [
+ 'redirect' => 'admin.locales.index'
+ ])->name('admin.locales.update');
+
Route::get('/locales/delete/{id}', 'Webkul\Core\Http\Controllers\LocaleController@destroy')->name('admin.locales.delete');
@@ -339,6 +347,14 @@ Route::group(['middleware' => ['web']], function () {
'redirect' => 'admin.currencies.index'
])->name('admin.currencies.store');
+ Route::get('/currencies/edit/{id}', 'Webkul\Core\Http\Controllers\CurrencyController@edit')->defaults('_config', [
+ 'view' => 'admin::settings.currencies.edit'
+ ])->name('admin.currencies.edit');
+
+ Route::put('/currencies/edit/{id}', 'Webkul\Core\Http\Controllers\CurrencyController@update')->defaults('_config', [
+ 'redirect' => 'admin.currencies.index'
+ ])->name('admin.currencies.update');
+
Route::get('/currencies/delete/{id}', 'Webkul\Core\Http\Controllers\CurrencyController@destroy')->name('admin.currencies.delete');
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 131bbfcd8..d8a9eb0ff 100644
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -312,8 +312,8 @@ return [
'settings' => [
'locales' => [
'title' => 'Locales',
- 'add-locale-title' => 'Add Locale',
- 'edit-locale-title' => 'Edit Locale',
+ 'add-title' => 'Add Locale',
+ 'edit-title' => 'Edit Locale',
'add-title' => 'Add Locale',
'save-btn-title' => 'Save Locale',
'general' => 'General',
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
index a1c02aeb4..420f5052b 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
@@ -95,7 +95,7 @@
{{ __('admin::app.catalog.categories.slug') }}
-
+
@{{ errors.first('slug') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
index de9ce4b72..ef47c455f 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
@@ -109,7 +109,7 @@
{{ __('admin::app.catalog.categories.slug') }}
-
+
@{{ errors.first('{!!$locale!!}[slug]') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
index 22b0820df..a26f04d62 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
@@ -88,7 +88,7 @@
{{ $attribute->admin_name }}
@if ($attribute->type == 'price')
- ({{ core()->getBaseCurrencySymbol() }})
+ ({{ currency()->symbol(core()->getBaseCurrencyCode()) }})
@endif
@{{ errors.first('name') }}
-
-
- {{ __('admin::app.settings.currencies.symbol') }}
-
- @{{ errors.first('symbol') }}
-
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
new file mode 100644
index 000000000..002f919d4
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
@@ -0,0 +1,50 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+ {{ __('admin::app.settings.currencies.edit-title') }}
+@stop
+
+@section('content')
+
+@stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
index ca1f3620b..786d65b5c 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
@@ -61,9 +61,9 @@
-
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
index f4bf97d2b..4a9abb012 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
@@ -1,7 +1,7 @@
@extends('admin::layouts.content')
@section('page_title')
- {{ __('admin::app.settings.locales.add-locale-title') }}
+ {{ __('admin::app.settings.locales.add-title') }}
@stop
@section('content')
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
new file mode 100644
index 000000000..418bfbe6e
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
@@ -0,0 +1,50 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+ {{ __('admin::app.settings.locales.edit-title') }}
+@stop
+
+@section('content')
+
+@stop
\ No newline at end of file
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 4128e88ca..ae14b98ee 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -161,7 +161,6 @@ class Cart {
*/
public function add($id, $data)
{
-
$itemData = $this->prepareItemData($id, $data);
if(!$itemData) {
@@ -196,8 +195,6 @@ class Cart {
'base_total' => $cartItem->price * ($prevQty + $newQty)
]);
- $this->collectTotals();
-
session()->flash('success', trans('shop::app.checkout.cart.quantity.success'));
return true;
@@ -248,8 +245,6 @@ class Cart {
$parent = $cart->items()->create($itemData['parent']);
}
- $this->collectTotals();
-
session()->flash('success', trans('shop::app.checkout.cart.item.success'));
return $cart;
@@ -323,8 +318,6 @@ class Cart {
session()->flash('success', trans('shop::app.checkout.cart.item.success'));
- $this->collectTotals();
-
return $cart;
}
}
@@ -334,8 +327,6 @@ class Cart {
session()->flash('success', trans('shop::app.checkout.cart.item.success'));
- $this->collectTotals();
-
return $cart;
}
}
@@ -493,8 +484,6 @@ class Cart {
}
$item->update(['quantity' => $quantity]);
-
- $this->collectTotals();
}
}
}
@@ -515,8 +504,6 @@ class Cart {
if($cart = $this->getCart()) {
$this->cartItem->delete($itemId);
- $this->collectTotals();
-
//delete the cart instance if no items are there
if($cart->items()->get()->count() == 0) {
$this->cart->delete($cart->id);
diff --git a/packages/Webkul/Core/src/Contracts/Validations/Code.php b/packages/Webkul/Core/src/Contracts/Validations/Code.php
index 03311fa76..e77e7c7b5 100644
--- a/packages/Webkul/Core/src/Contracts/Validations/Code.php
+++ b/packages/Webkul/Core/src/Contracts/Validations/Code.php
@@ -15,7 +15,7 @@ class Code implements Rule
*/
public function passes($attribute, $value)
{
- return preg_match('/^[a-z]+[a-z0-9_]+$/', $value);
+ return preg_match('/^[a-zA-Z]+[a-zA-Z0-9_]+$/', $value);
}
/**
diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index 54c234b5f..26126db19 100644
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -237,21 +237,6 @@ class Core
return ($currency = $this->getBaseCurrency()) ? $currencyCode = $currency->code : '';
}
- /**
- * Returns base channel's currency symbol
- *
- * @return string
- */
- public function getBaseCurrencySymbol()
- {
- static $currencySymbol;
-
- if($currencySymbol)
- return $currencySymbol;
-
- return $currencySymbol = $this->getBaseCurrency()->symbol ?? $this->getBaseCurrencyCode();
- }
-
/**
* Returns base channel's currency model
*
@@ -284,21 +269,6 @@ class Core
return ($currency = $this->getChannelBaseCurrency()) ? $currencyCode = $currency->code : '';
}
- /**
- * Returns base channel's currency symbol
- *
- * @return string
- */
- public function getChannelBaseCurrencySymbol()
- {
- static $currencySymbol;
-
- if($currencySymbol)
- return $currencySymbol;
-
- return $currencySymbol = $this->getChannelBaseCurrency()->symbol;
- }
-
/**
* Returns current channel's currency model
*
@@ -311,7 +281,12 @@ class Core
if($currency)
return $currency;
- return $currency = $this->currencyRepository->first();
+ if($currencyCode = session()->get('currency')) {
+ if($currency = $this->currencyRepository->findOneByField('code', $currencyCode))
+ return $currency;
+ }
+
+ return $currency = $this->getChannelBaseCurrency();
}
/**
@@ -329,21 +304,6 @@ class Core
return ($currency = $this->getCurrentCurrency()) ? $currencyCode = $currency->code : '';
}
- /**
- * Returns current channel's currency symbol
- *
- * @return string
- */
- public function getCurrentCurrencySymbol()
- {
- static $currencySymbol;
-
- if($currencySymbol)
- return $currencySymbol;
-
- return $currencySymbol = $this->getCurrentCurrency()->symbol;
- }
-
/**
* Converts price
*
diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054502_create_currencies_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054502_create_currencies_table.php
index 010961fff..5d8dc5af5 100644
--- a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054502_create_currencies_table.php
+++ b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054502_create_currencies_table.php
@@ -16,7 +16,6 @@ class CreateCurrenciesTable extends Migration
Schema::create('currencies', function (Blueprint $table) {
$table->increments('id');
$table->string('code');
- $table->string('symbol');
$table->string('name');
$table->timestamps();
});
diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php
index 420fb7a93..83764e3a9 100644
--- a/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php
+++ b/packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php
@@ -17,7 +17,7 @@ class CreateCurrencyExchangeRatesTable extends Migration
$table->increments('id');
$table->decimal('rate', 10, 5);
- $table->integer('target_currency')->unsigned();
+ $table->integer('target_currency')->unique()->unsigned();
$table->foreign('target_currency')->references('id')->on('currencies')->onDelete('cascade');
$table->timestamps();
});
diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
index 3c41908a2..a2be0789a 100644
--- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
@@ -73,8 +73,7 @@ class CurrencyController extends Controller
{
$this->validate(request(), [
'code' => 'required|unique:countries,code',
- 'name' => 'required',
- 'symbol' => 'required'
+ 'name' => 'required'
]);
$this->currency->create(request()->all());
@@ -84,6 +83,40 @@ class CurrencyController extends Controller
return redirect()->route($this->_config['redirect']);
}
+ /**
+ * Show the form for editing the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function edit($id)
+ {
+ $currency = $this->currency->find($id);
+
+ return view($this->_config['view'], compact('currency'));
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function update(Request $request, $id)
+ {
+ $this->validate(request(), [
+ 'code' => ['required', 'unique:currencies,code,' . $id, new \Webkul\Core\Contracts\Validations\Code],
+ 'name' => 'required'
+ ]);
+
+ $this->currency->update(request()->all(), $id);
+
+ session()->flash('success', 'Currency updated successfully.');
+
+ return redirect()->route($this->_config['redirect']);
+ }
+
/**
* Remove the specified resource from storage.
*
diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
index b9e7a3e57..4e526972a 100644
--- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
@@ -85,7 +85,7 @@ class ExchangeRateController extends Controller
public function store(Request $request)
{
$this->validate(request(), [
- 'target_currency' => 'required',
+ 'target_currency' => ['required', 'unique:currency_exchange_rates,target_currency'],
'rate' => 'required|numeric'
]);
@@ -121,8 +121,8 @@ class ExchangeRateController extends Controller
public function update(Request $request, $id)
{
$this->validate(request(), [
- 'target_currency' => 'required',
- 'ratio' => 'required|numeric'
+ 'target_currency' => ['required', 'unique:currency_exchange_rates,target_currency,' . $id],
+ 'rate' => 'required|numeric'
]);
$this->exchangeRate->update(request()->all(), $id);
diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
index 2cbf71847..bdc77fdee 100644
--- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
@@ -83,6 +83,40 @@ class LocaleController extends Controller
return redirect()->route($this->_config['redirect']);
}
+ /**
+ * Show the form for editing the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function edit($id)
+ {
+ $locale = $this->locale->find($id);
+
+ return view($this->_config['view'], compact('locale'));
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function update(Request $request, $id)
+ {
+ $this->validate(request(), [
+ 'code' => ['required', 'unique:locales,code,' . $id, new \Webkul\Core\Contracts\Validations\Code],
+ 'name' => 'required'
+ ]);
+
+ $this->locale->update(request()->all(), $id);
+
+ session()->flash('success', 'Locale updated successfully.');
+
+ return redirect()->route($this->_config['redirect']);
+ }
+
/**
* Remove the specified resource from storage.
*
diff --git a/packages/Webkul/Core/src/Models/Currency.php b/packages/Webkul/Core/src/Models/Currency.php
index 6b58d0ac0..787b55459 100644
--- a/packages/Webkul/Core/src/Models/Currency.php
+++ b/packages/Webkul/Core/src/Models/Currency.php
@@ -12,6 +12,6 @@ class Currency extends Model
* @var array
*/
protected $fillable = [
- 'code', 'name', 'symbol'
+ 'code', 'name'
];
}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
index 542b35e02..136e93254 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
@@ -88,9 +88,11 @@ class CartController extends Controller
public function add($id) {
$data = request()->input();
- // dd($data);
+
Cart::add($id, $data);
+ Cart::collectTotals();
+
return redirect()->back();
}
@@ -102,6 +104,8 @@ class CartController extends Controller
public function remove($itemId) {
Cart::removeItem($itemId);
+ Cart::collectTotals();
+
return redirect()->back();
}
@@ -123,6 +127,8 @@ class CartController extends Controller
Cart::update($data);
+ Cart::collectTotals();
+
return redirect()->back();
}
diff --git a/packages/Webkul/Shop/src/Http/Middleware/Currency.php b/packages/Webkul/Shop/src/Http/Middleware/Currency.php
new file mode 100644
index 000000000..3f8b5ca55
--- /dev/null
+++ b/packages/Webkul/Shop/src/Http/Middleware/Currency.php
@@ -0,0 +1,44 @@
+currency = $currency;
+ }
+
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ if($currency = $request->get('currency')) {
+ if($this->currency->findOneByField('code', $currency)) {
+ session()->put('currency', $currency);
+ }
+ } else {
+ if(!session()->get('currency')) {
+ session()->put('currency', core()->getChannelBaseCurrencyCode());
+ }
+ }
+
+ return $next($request);
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index de905434d..2cce2c032 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -1,6 +1,6 @@
['web', 'theme', 'locale']], function () {
+Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function () {
Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [
'view' => 'shop::home.index'
diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
index ab2f2e477..1053d5dff 100644
--- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
+++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
@@ -8,6 +8,7 @@ use Illuminate\Routing\Router;
use Illuminate\Support\Facades\Blade;
use Webkul\Shop\Http\Middleware\Locale;
use Webkul\Shop\Http\Middleware\Theme;
+use Webkul\Shop\Http\Middleware\Currency;
use Webkul\Shop\Providers\ComposerServiceProvider;
use Webkul\Ui\Menu;
@@ -31,8 +32,8 @@ class ShopServiceProvider extends ServiceProvider
$this->loadViewsFrom(__DIR__ . '/../Resources/views', 'shop');
$router->aliasMiddleware('locale', Locale::class);
-
$router->aliasMiddleware('theme', Theme::class);
+ $router->aliasMiddleware('currency', Currency::class);
$this->app->register(ComposerServiceProvider::class);
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 7cb0ddf48..c0cf15bd0 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -382,6 +382,21 @@ section.slider-block {
align-items: center;
// cursor: pointer;
+ .currency-switcher {
+ float: right;
+ border-right: 2px solid $border-color;
+ cursor: pointer;
+
+ .dropdown-list {
+ width: 100px;
+ top: 37px;
+
+ .dropdown-container {
+ padding: 0 10px;
+ }
+ }
+ }
+
ul.account-dropdown-container {
float: right;
border-right: 2px solid $border-color;
@@ -390,6 +405,7 @@ section.slider-block {
display: flex;
flex-direction: row;
margin-right: 14px;
+ margin-left: 14px;
.dropdown-list {
width: 300px;
@@ -613,21 +629,6 @@ section.slider-block {
display: none;
}
- .nav > li:last-child {
- display:flex; align-items:center;
- border-radius: 0 0 4px 0;
- float:right;
- display: none;
-
- img {
- margin-right:6px;
- }
- }
-
- .nav > li:last-child > a {
- border-radius: 0 4px 0 0;
- }
-
.nav li li a {
margin-top: 1px;
}
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index eba7c0777..973b47420 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -241,7 +241,8 @@ return [
'success_remove' => 'Item removed successfully',
'error_add' => 'Item cannot be added to cart',
],
- 'quantity-error' => 'Requested quantity is not available.'
+ 'quantity-error' => 'Requested quantity is not available.',
+ 'cart-subtotal' => 'Cart Subtotal'
],
'onepage' => [
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 f8b072085..f479b461c 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -28,26 +28,30 @@
@foreach($cart->items as $item)
product;
- $productBaseImage = $productImageHelper->getProductBaseImage($product);
+ if($item->type == "configurable")
+ $productBaseImage = $productImageHelper->getProductBaseImage($item->child->product);
+ else
+ $productBaseImage = $productImageHelper->getProductBaseImage($item->product);
?>
-
+
{{ core()->currency($item->base_price) }}
- @if ($product->type == 'configurable')
+ @if ($item->type == 'configurable')
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
new file mode 100644
index 000000000..0a59b9b9c
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
@@ -0,0 +1,92 @@
+@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
+getCart(); ?>
+
+@if($cart)
+ items; ?>
+
+
+
+
+ Cart
+ ({{ intval($cart->items_qty) }})
+
+
+
+
+
+
+
+
+
+
+
+
+ @foreach($items as $item)
+ @if($item->type == "configurable")
+
+
+
+ @php
+ $images = $productImageHelper->getProductBaseImage($item->child->product);
+ @endphp
+
+
+
+
+
+
{{ $item->child->name }}
+
+
{{ core()->currency($item->total) }}
+
+
Quantity - {{ $item->quantity }}
+
+
+
+ @else
+
+
+
+ @php
+ $images = $productImageHelper->getProductBaseImage($item->product);
+ @endphp
+
+
+
+
+
+
{{ $item->name }}
+
+
{{ $item->total }}
+
+
Quantity - {{ $item->quantity }}
+
+
+
+ @endif
+ @endforeach
+
+
+
+
+
+
+
+@else
+
+
+@endif
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
index 65d200ef8..d1cefc985 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
@@ -3,11 +3,7 @@
- @if($cart->items_qty - intval($cart->items_qty) > 0)
- {{ $cart->items_qty }}
- @else
- {{ intval($cart->items_qty) }}
- @endif
+ {{ intval($cart->items_qty) }}
{{ __('shop::app.checkout.total.sub-total') }}
{{ __('shop::app.checkout.total.price') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
index 2f0b3455d..b36efd796 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@@ -25,6 +25,27 @@
+ @if (core()->getCurrentChannel()->currencies->count() > 1)
+
+
+ USD
+
+
+
+
+
+
+ @foreach (core()->getCurrentChannel()->currencies as $currency)
+
+ {{ $currency->code }}
+
+ @endforeach
+
+
+
+
+ @endif
+
@@ -79,108 +100,13 @@
- getCart(); ?>
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
- @if($cart)
- items; ?>
-
-
-
- @if($cart->items_qty - intval($cart->items_qty) > 0)
-
-
- Cart
- ({{ $cart->items_qty }})
-
-
- @else
-
-
- Cart
- ({{ intval($cart->items_qty) }})
-
-
- @endif
-
-
-
-
-
-
-
-
-
-
-
- @foreach($items as $item)
- @if($item->type == "configurable")
-
-
-
- @php
- $images = $productImageHelper->getProductBaseImage($item->child->product);
- @endphp
-
-
-
-
-
-
{{ $item->child->name }}
-
-
{{ $item->total }}
-
-
Quantity - {{ $item->quantity }}
-
-
-
- @else
-
-
-
- @php
- $images = $productImageHelper->getProductBaseImage($item->product);
- @endphp
-
-
-
-
-
-
{{ $item->name }}
-
-
{{ $item->total }}
-
-
Quantity - {{ $item->quantity }}
-
-
-
- @endif
- @endforeach
-
-
-
-
-
-
-
- @else
-
-
- @endif
+
+ @include('shop::checkout.cart.mini-cart')
@@ -242,14 +168,18 @@
+ getCart(); ?>
+
@if(isset($cart))
-
+
@else
-
-
-
+
+
+
@endif
diff --git a/packages/Webkul/Ui/src/Resources/assets/js/directives/code.vue b/packages/Webkul/Ui/src/Resources/assets/js/directives/code.vue
index 31c048778..473121418 100644
--- a/packages/Webkul/Ui/src/Resources/assets/js/directives/code.vue
+++ b/packages/Webkul/Ui/src/Resources/assets/js/directives/code.vue
@@ -3,7 +3,7 @@
bind(el, binding, vnode) {
let handler = function(e) {
setTimeout(function() {
- e.target.value = e.target.value.toString().toLowerCase()
+ e.target.value = e.target.value.toString()
.replace(/[^\w_ ]+/g,'')
.trim()
.replace(/ +/g,'-');
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 3a2fb976c..1c4d36691 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -772,6 +772,42 @@ h2 {
}
}
+.badge {
+ background: #E7E7E7;
+ @include border-radius(2px);
+ padding: 8px;
+ color: #000311;
+ display: inline-block;
+
+ &.label-sm {
+ padding: 5px;
+ }
+
+ &.label-md {
+ padding: 8px;
+ }
+
+ &.label-lg {
+ padding: 11px;
+ }
+
+ &.label-xl {
+ padding: 14px;
+ }
+
+ &.success {
+ background-color: $success-color;
+ }
+
+ &.danger {
+ background-color: $danger-color;
+ }
+
+ &.warning {
+ background-color: $warning-color;
+ }
+}
+
.image-wrapper {
margin-bottom: 20px;
display: inline-block;
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index 3e1ad113e..3b03c9279 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -950,6 +950,21 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
align-items: center;
}
+.header .header-top div.right-content .currency-switcher {
+ float: right;
+ border-right: 2px solid #C7C7C7;
+ cursor: pointer;
+}
+
+.header .header-top div.right-content .currency-switcher .dropdown-list {
+ width: 100px;
+ top: 37px;
+}
+
+.header .header-top div.right-content .currency-switcher .dropdown-list .dropdown-container {
+ padding: 0 10px;
+}
+
.header .header-top div.right-content ul.account-dropdown-container {
float: right;
border-right: 2px solid #C7C7C7;
@@ -964,6 +979,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
-ms-flex-direction: row;
flex-direction: row;
margin-right: 14px;
+ margin-left: 14px;
}
.header .header-top div.right-content ul.account-dropdown-container li.account-dropdown .dropdown-list {
@@ -1216,26 +1232,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
display: none;
}
-.header .header-bottom .nav > li:last-child {
- display: -webkit-box;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-align: center;
- -ms-flex-align: center;
- align-items: center;
- border-radius: 0 0 4px 0;
- float: right;
- display: none;
-}
-
-.header .header-bottom .nav > li:last-child img {
- margin-right: 6px;
-}
-
-.header .header-bottom .nav > li:last-child > a {
- border-radius: 0 4px 0 0;
-}
-
.header .header-bottom .nav li li a {
margin-top: 1px;
}