@@ -257,7 +257,7 @@ class="label-pending"
@lang('admin::app.customers.customers.view.default-address')
-
+
@{{ `${address.first_name} ${address.last_name}` }}
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/create.blade.php
index 4f426d90d5b..c5275edad73 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/create.blade.php
@@ -15,7 +15,7 @@
>
@if (bouncer()->hasPermission('customers.addresses.create'))
-
@@ -32,96 +32,127 @@ class="flex cursor-pointer items-center justify-between gap-1.5 px-2.5 text-blue
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/communications/campaigns/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/communications/campaigns/edit.blade.php
index 9c18bbc587c..bbae5551755 100755
--- a/packages/Webkul/Admin/src/Resources/views/marketing/communications/campaigns/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/communications/campaigns/edit.blade.php
@@ -37,7 +37,7 @@ class="primary-button"
-
+
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php
index 8a9aadcfbb5..553fa0eb68c 100644
--- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php
@@ -624,6 +624,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
+
@lang('admin::app.marketing.promotions.cart-rules.create.from')
@@ -641,6 +642,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
+
@lang('admin::app.marketing.promotions.cart-rules.create.to')
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php
index 84f314c0287..2d2949caed0 100644
--- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php
@@ -28,7 +28,7 @@ class="transparent-button hover:bg-gray-200 dark:text-white dark:hover:bg-gray-8
@lang('admin::app.marketing.promotions.cart-rules.edit.back-btn')
-
+
-
+
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index a53c0e04b12..f78a6bf3a74 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -532,7 +532,7 @@ class="secondary-button"
@foreach ($order->comments()->orderBy('id', 'desc')->get() as $comment)
-
+
{{ $comment->comment }}
@@ -709,7 +709,7 @@ class="secondary-button"
@php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
-
+
@if (! empty($additionalDetails))
{{ $additionalDetails['title'] }}
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
index 4ef9b6f4f3d..bcfc95a958d 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/refunds/view.blade.php
@@ -267,7 +267,7 @@ class="text-blue-600 hover:underline"
@endif
-
+
@if ($refund->base_discount_amount > 0)
{{ core()->formatBasePrice($refund->base_discount_amount) }}
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
index 5963b8c06ef..f40c3d26c58 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
@@ -6,7 +6,10 @@
{!! view_render_event('bagisto.admin.settings.channels.create.before') !!}
-
+
{!! view_render_event('admin.settings.channels.create.create_form_controls.before') !!}
@@ -103,7 +106,7 @@ class="primary-button"
-
+
@lang('admin::app.settings.channels.create.inventory-sources')
@@ -134,7 +137,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
-
+
@lang('admin::app.settings.channels.create.root-category')
@@ -267,7 +270,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
@lang('admin::app.settings.channels.create.seo')
-
+
@@ -331,6 +334,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
{!! view_render_event('bagisto.admin.settings.channels.create.card.seo.after') !!}
+
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
index b52e28e47c7..25c37f4f55f 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@@ -12,7 +12,7 @@
{!! view_render_event('bagisto.admin.settings.channels.edit.before', ['channel' => $channel]) !!}
-
+
@lang('admin::app.settings.channels.edit.save-btn')
@@ -345,7 +345,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
-
+
{!! view_render_event('bagisto.admin.settings.channels.edit.card.accordion.currencies_and_locales.before', ['channel' => $channel]) !!}
@@ -367,7 +367,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
@lang('admin::app.settings.channels.edit.locales')
- @php $selectedLocalesId = old('locales') ?? $channel->locales->pluck('id')->toArray() @endphp
+ @php $selectedLocalesId = old('locales') ?? $channel->locales->pluck('id')->toArray(); @endphp
@foreach (core()->getAllLocales() as $locale)
@@ -424,7 +424,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
@lang('admin::app.settings.channels.edit.currencies')
- @php $selectedCurrenciesId = old('currencies') ?: $channel->currencies->pluck('id')->toArray() @endphp
+ @php $selectedCurrenciesId = old('currencies') ?: $channel->currencies->pluck('id')->toArray(); @endphp
@foreach (core()->getAllCurrencies() as $currency)
@@ -481,7 +481,7 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
{!! view_render_event('bagisto.admin.settings.channels.edit.card.accordion.settings.before', ['channel' => $channel]) !!}
-
+
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php
index 8422e607034..1fccd052b69 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php
@@ -160,10 +160,10 @@ class="text-lg font-bold text-gray-800 dark:text-white"
type="text"
name="code"
rules="required|min:3|max:3"
- :value="old('code')"
- v-model="selectedCurrency.code"
+ ::value="selectedCurrency.code"
:label="trans('admin::app.settings.currencies.index.create.code')"
:placeholder="trans('admin::app.settings.currencies.index.create.code')"
+ ::disabled="selectedCurrency.code"
/>
@@ -364,10 +364,10 @@ class="primary-button"
this.$refs.currencyUpdateOrCreateModal.close();
- this.$refs.datagrid.get();
-
this.$emitter.emit('add-flash', { type: 'success', message: response.data.message });
+ this.$refs.datagrid.get();
+
resetForm();
})
.catch(error => {
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/data-transfer/imports/import.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/data-transfer/imports/import.blade.php
index fd291b809f2..1bcddbdc362 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/data-transfer/imports/import.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/data-transfer/imports/import.blade.php
@@ -27,7 +27,7 @@ class="primary-button"
-
+
@pushOnce('scripts')
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/create.blade.php
index 742b5f73058..cc79c6364e0 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/create.blade.php
@@ -36,7 +36,7 @@ class="primary-button"
-
+
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/edit.blade.php
index 53601c46b91..74ec8acbde8 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/edit.blade.php
@@ -39,7 +39,7 @@ class="primary-button"
-
+
@@ -224,7 +224,7 @@ class="text-gray-600 dark:text-gray-300"
-
+
@lang('admin::app.settings.inventory-sources.edit.latitude')
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php
index 675308bd48e..c45a9542d52 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php
@@ -165,6 +165,8 @@ class="primary-button"
+
+
+
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/taxes/rates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/taxes/rates/edit.blade.php
index 09482171a3c..67da5edea92 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/taxes/rates/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/taxes/rates/edit.blade.php
@@ -51,7 +51,7 @@ class="primary-button"
{!! view_render_event('bagisto.admin.settings.taxes.rates.edit.edit_form_controls.before', ['taxRate' => $taxRate]) !!}
-
+
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/themes/edit/category-carousel.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/themes/edit/category-carousel.blade.php
index 800d5e1b6e3..f97013802b1 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/themes/edit/category-carousel.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/themes/edit/category-carousel.blade.php
@@ -176,7 +176,7 @@ class="secondary-button"
-
+
-
+
-
+
$this->envDetails['DB_HOST'] ?? '',
+ "database.connections.{$connection}.port" => $this->envDetails['DB_PORT'] ?? '',
+ "database.connections.{$connection}.database" => $this->envDetails['DB_DATABASE'] ?? '',
+ "database.connections.{$connection}.username" => $this->envDetails['DB_USERNAME'] ?? '',
+ "database.connections.{$connection}.password" => $this->envDetails['DB_PASSWORD'] ?? '',
+ "database.connections.{$connection}.prefix" => $this->envDetails['DB_PREFIX'] ?? '',
+ ]);
+
+ DB::purge($connection);
+ DB::reconnect($connection);
+
+ try {
+ DB::connection()->getPdo();
+
+ $this->components->info('Database connection established successfully.');
+ } catch (\Exception $e) {
+ $this->error('Database connection failed. Please check your credentials.');
+
+ abort(400);
+ }
+ }
+
/**
* Get sorted list of timezone abbreviations.
*/
diff --git a/packages/Webkul/Installer/src/Database/Seeders/Core/CurrencyTableSeeder.php b/packages/Webkul/Installer/src/Database/Seeders/Core/CurrencyTableSeeder.php
index 20d2f81cb77..672b9b45725 100755
--- a/packages/Webkul/Installer/src/Database/Seeders/Core/CurrencyTableSeeder.php
+++ b/packages/Webkul/Installer/src/Database/Seeders/Core/CurrencyTableSeeder.php
@@ -16,6 +16,7 @@ class CurrencyTableSeeder extends Seeder
'AED' => 'د.إ',
'ARS' => '$',
'AUD' => 'A$',
+ 'BHD' => '.د.ب',
'BDT' => '৳',
'BHD' => 'BHD',
'BRL' => 'R$',
@@ -104,7 +105,7 @@ public function run($parameters = [])
'id' => $key + 1,
'code' => $currency,
'name' => trans('installer::app.seeders.core.currencies.'.$currency, [], $defaultLocale),
- 'symbol' => $this->currencySymbols[$currency],
+ 'symbol' => $this->currencySymbols[$currency] ?? '',
],
]);
}
diff --git a/packages/Webkul/Installer/src/Http/Controllers/InstallerController.php b/packages/Webkul/Installer/src/Http/Controllers/InstallerController.php
index e3f24174807..a40c42a4021 100644
--- a/packages/Webkul/Installer/src/Http/Controllers/InstallerController.php
+++ b/packages/Webkul/Installer/src/Http/Controllers/InstallerController.php
@@ -7,6 +7,7 @@
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Log;
use Webkul\Installer\Helpers\DatabaseManager;
use Webkul\Installer\Helpers\EnvironmentManager;
use Webkul\Installer\Helpers\ServerRequirements;
@@ -168,7 +169,9 @@ public function adminConfigSetup()
return true;
} catch (\Throwable $th) {
- dd($th);
+ Log::error('Error in Admin installer config setup'.$th->getMessage());
+
+ return false;
}
}
diff --git a/packages/Webkul/Installer/src/Resources/views/components/button/index.blade.php b/packages/Webkul/Installer/src/Resources/views/components/button/index.blade.php
index 8b3e20282ee..8cc0741e98b 100644
--- a/packages/Webkul/Installer/src/Resources/views/components/button/index.blade.php
+++ b/packages/Webkul/Installer/src/Resources/views/components/button/index.blade.php
@@ -42,7 +42,7 @@ class="opacity-75"
-
+
@{{ title }}
diff --git a/packages/Webkul/Installer/src/Resources/views/installer/index.blade.php b/packages/Webkul/Installer/src/Resources/views/installer/index.blade.php
index 22f764f246c..669a9e10051 100644
--- a/packages/Webkul/Installer/src/Resources/views/installer/index.blade.php
+++ b/packages/Webkul/Installer/src/Resources/views/installer/index.blade.php
@@ -387,7 +387,7 @@ class="primary-button"
-
+
$variantData) {
if (Str::contains($variantId, 'variant_')) {
- $permutation = [];
+ $superAttributes = [];
foreach ($product->super_attributes as $superAttribute) {
- $permutation[$superAttribute->id] = $variantData[$superAttribute->code];
+ $superAttributes[$superAttribute->id] = $variantData[$superAttribute->code];
+
+ $this->fillableVariantAttributes->push($superAttribute);
}
- $this->createVariant($product, $permutation, array_merge($variantData, [
+ $this->createVariant($product, $superAttributes, array_merge($variantData, [
'channel' => $data['channel'] ?? core()->getDefaultChannelCode(),
'locale' => $data['locale'] ?? core()->getDefaultLocaleCodeFromDefaultChannel(),
]));
diff --git a/packages/Webkul/Sales/src/Exceptions/InvalidRefundQuantityException.php b/packages/Webkul/Sales/src/Exceptions/InvalidRefundQuantityException.php
new file mode 100644
index 00000000000..107bd8026c6
--- /dev/null
+++ b/packages/Webkul/Sales/src/Exceptions/InvalidRefundQuantityException.php
@@ -0,0 +1,7 @@
+qty;
}
+ $shippedQty -= $orderItem->qty_invoiced;
+
$inventory = $orderItem->product->inventories()
->where('inventory_source_id', $shipmentItem->shipment->inventory_source_id)
->first();
diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
index 4ae58626c49..25b21995192 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
@@ -8,8 +8,9 @@
use Illuminate\Support\Facades\Log;
use Webkul\Core\Eloquent\Repository;
use Webkul\Product\Repositories\ProductCustomizableOptionRepository;
+use Webkul\Sales\Contracts\Order as OrderContract;
use Webkul\Sales\Generators\OrderSequencer;
-use Webkul\Sales\Models\Order as OrderModel;
+use Webkul\Sales\Models\Order;
class OrderRepository extends Repository
{
@@ -32,7 +33,7 @@ public function __construct(
*/
public function model(): string
{
- return 'Webkul\Sales\Contracts\Order';
+ return OrderContract::class;
}
/**
@@ -47,7 +48,7 @@ public function createOrderIfNotThenRetry(array $data)
try {
Event::dispatch('checkout.order.save.before', [$data]);
- $data['status'] = 'pending';
+ $data['status'] = Order::STATUS_PENDING;
$order = $this->model->create(array_merge($data, ['increment_id' => $this->generateIncrementId()]));
@@ -207,12 +208,31 @@ public function isInCompletedState($order)
$totalQtyCanceled += $item->qty_canceled;
}
+ /**
+ * Canceled state.
+ */
+ if ($totalQtyOrdered === $totalQtyCanceled) {
+ return false;
+ }
+
+ /**
+ * Closed state.
+ */
+ if ($totalQtyOrdered === $totalQtyRefunded + $totalQtyCanceled) {
+ return false;
+ }
+
+ /**
+ * Completed state.
+ */
if (
- $totalQtyOrdered != ($totalQtyRefunded + $totalQtyCanceled)
- && $totalQtyOrdered == $totalQtyInvoiced + $totalQtyCanceled
- && $totalQtyOrdered == $totalQtyShipped + $totalQtyRefunded + $totalQtyCanceled
+ $totalQtyOrdered === $totalQtyInvoiced + $totalQtyCanceled
) {
- return true;
+ if ($totalQtyInvoiced === $totalQtyShipped) {
+ return $totalQtyOrdered === $totalQtyShipped + $totalQtyCanceled;
+ }
+
+ return $totalQtyOrdered === $totalQtyShipped + $totalQtyRefunded;
}
/**
@@ -220,7 +240,7 @@ public function isInCompletedState($order)
* then it can be considered as completed.
*/
if (
- $order->status === OrderModel::STATUS_COMPLETED
+ $order->status === Order::STATUS_COMPLETED
&& $totalQtyOrdered != $totalQtyRefunded
) {
return true;
@@ -280,20 +300,21 @@ public function updateOrderStatus($order, $orderState = null)
if (! empty($orderState)) {
$status = $orderState;
} else {
- $status = 'processing';
+ $status = Order::STATUS_PROCESSING;
if ($this->isInCompletedState($order)) {
- $status = 'completed';
+ $status = Order::STATUS_COMPLETED;
}
if ($this->isInCanceledState($order)) {
- $status = 'canceled';
+ $status = Order::STATUS_CANCELED;
} elseif ($this->isInClosedState($order)) {
- $status = 'closed';
+ $status = Order::STATUS_CLOSED;
}
}
$order->status = $status;
+
$order->save();
Event::dispatch('sales.order.update-status.after', $order);
@@ -368,9 +389,9 @@ public function collectTotals($order)
* @param \Webkul\Sales\Models\Order|int $orderOrId
* @return \Webkul\Sales\Contracts\Order
*/
- private function resolveOrderInstance($orderOrId)
+ protected function resolveOrderInstance($orderOrId)
{
- return $orderOrId instanceof OrderModel
+ return $orderOrId instanceof Order
? $orderOrId
: $this->findOrFail($orderOrId);
}
diff --git a/packages/Webkul/Sales/src/Repositories/RefundRepository.php b/packages/Webkul/Sales/src/Repositories/RefundRepository.php
index 810a5c6894e..92271087324 100644
--- a/packages/Webkul/Sales/src/Repositories/RefundRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/RefundRepository.php
@@ -6,6 +6,7 @@
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
use Webkul\Core\Eloquent\Repository;
+use Webkul\Sales\Exceptions\InvalidRefundQuantityException;
class RefundRepository extends Repository
{
@@ -243,7 +244,7 @@ public function getOrderItemsRefundSummary($data, $orderId)
$orderItem = $this->orderItemRepository->find($orderItemId);
if ($qty > $orderItem->qty_to_refund) {
- throw new \Exception(trans('admin::app.sales.refunds.create.invalid-qty'));
+ throw new InvalidRefundQuantityException(trans('admin::app.sales.refunds.create.invalid-qty'));
}
$totals['subtotal']['price'] += $orderItem->base_price * $qty;
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/login.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/login.blade.php
index 7847d49ce8e..eb801d4d045 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/login.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/login.blade.php
@@ -45,6 +45,7 @@ class="cursor-pointer text-base font-medium text-blue-700"
+
@lang('shop::app.checkout.login.email')
@@ -64,6 +65,7 @@ class="px-6 py-4"
+
@lang('shop::app.checkout.login.password')
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php
index a70ec17ee92..25377073361 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php
@@ -1,41 +1,13 @@
@lang('shop::app.checkout.success.thanks')
- {!! view_render_event('bagisto.shop.checkout.onepage.header.before') !!}
-
-
-
-
-
-
- @guest('customer')
- @include('shop::checkout.login')
- @endguest
-
-
@@ -44,8 +16,8 @@ class="flex min-h-[30px]"
 }})
{{ view_render_event('bagisto.shop.checkout.success.image.after', ['order' => $order]) }}
@@ -53,14 +25,14 @@ class="max-md:h-[100px] max-md:w-[100px]"
@if (auth()->guard('customer')->user())
@lang('shop::app.checkout.success.order-id-info', [
- 'order_id' => '' . $order->increment_id . ''
+ 'order_id' => ''.$order->increment_id.''
])
@else
@lang('shop::app.checkout.success.order-id-info', ['order_id' => $order->increment_id])
@endif
-
+
@lang('shop::app.checkout.success.thanks')
@@ -75,7 +47,7 @@ class="max-md:h-[100px] max-md:w-[100px]"
{{ view_render_event('bagisto.shop.checkout.success.continue-shopping.before', ['order' => $order]) }}
-
+
@lang('shop::app.checkout.cart.index.continue-shopping')
diff --git a/packages/Webkul/Shop/src/Resources/views/compare/index.blade.php b/packages/Webkul/Shop/src/Resources/views/compare/index.blade.php
index b2ed1fafd1a..edfd4ac8cc3 100644
--- a/packages/Webkul/Shop/src/Resources/views/compare/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/compare/index.blade.php
@@ -67,7 +67,7 @@ class="secondary-button flex items-center gap-x-2.5 whitespace-nowrap border-zin
diff --git a/packages/Webkul/Shop/src/Resources/views/components/button/index.blade.php b/packages/Webkul/Shop/src/Resources/views/components/button/index.blade.php
index 06b55b1162f..ef69e9ee236 100644
--- a/packages/Webkul/Shop/src/Resources/views/components/button/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/components/button/index.blade.php
@@ -42,7 +42,7 @@ class="opacity-75"
-
+
@{{ title }}
diff --git a/packages/Webkul/Shop/src/Resources/views/components/layouts/account/navigation.blade.php b/packages/Webkul/Shop/src/Resources/views/components/layouts/account/navigation.blade.php
index 5cc76c2ea57..f35fba5a525 100644
--- a/packages/Webkul/Shop/src/Resources/views/components/layouts/account/navigation.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/components/layouts/account/navigation.blade.php
@@ -14,7 +14,7 @@ class="h-[60px] w-[60px] rounded-full"
-
Hello! {{ $customer->first_name }}
+
Hello! {{ $customer->first_name }}
{{ $customer->email }}
+
-
+
- Hello! {{ auth()->user()?->first_name }}
+ Hello! {{ auth()->user()?->first_name }}
{{ auth()->user()?->email }}
diff --git a/packages/Webkul/Shop/src/Resources/views/components/media/index.blade.php b/packages/Webkul/Shop/src/Resources/views/components/media/index.blade.php
index 416fac0c414..dec80af9e7b 100644
--- a/packages/Webkul/Shop/src/Resources/views/components/media/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/components/media/index.blade.php
@@ -1,4 +1,13 @@
-
+@props([
+ 'width' => '200px',
+ 'height' => '200px'
+])
+
+
@@ -23,14 +32,14 @@ class="group relative flex h-[200px] w-[200px] max-md:h-36 max-md:w-36 max-sm:h-
![Uploaded Image]()
@@ -38,20 +47,21 @@ class="icon-bin cursor-pointer text-2xl text-black"