diff --git a/packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php b/packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php
index 145a37c81..cc34a0fe5 100644
--- a/packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php
+++ b/packages/Webkul/API/Http/Controllers/Shop/CheckoutController.php
@@ -129,7 +129,10 @@ class CheckoutController extends Controller
{
$shippingMethod = request()->get('shipping_method');
- if (Cart::hasError() || !$shippingMethod || ! Cart::saveShippingMethod($shippingMethod)) {
+ if (Cart::hasError()
+ || !$shippingMethod
+ || ! Cart::saveShippingMethod($shippingMethod)
+ ) {
abort(400);
}
diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php
index a3e346d76..59fea81bb 100755
--- a/packages/Webkul/Admin/src/Exceptions/Handler.php
+++ b/packages/Webkul/Admin/src/Exceptions/Handler.php
@@ -68,8 +68,8 @@ class Handler extends ExceptionHandler
if (request()->expectsJson()) {
return response()->json([
'error' => isset($this->jsonErrorMessages[$statusCode])
- ? $this->jsonErrorMessages[$statusCode]
- : 'Something went wrong, please try again later.'
+ ? $this->jsonErrorMessages[$statusCode]
+ : 'Something went wrong, please try again later.'
], $statusCode);
}
diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
index 772126af0..a20b641c7 100644
--- a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
+++ b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
@@ -26,7 +26,9 @@ class ConfigurationForm extends FormRequest
{
$this->rules = [];
- if (request()->has('general.design.admin_logo.logo_image') && ! request()->input('general.design.admin_logo.logo_image.delete')) {
+ if (request()->has('general.design.admin_logo.logo_image')
+ && ! request()->input('general.design.admin_logo.logo_image.delete')
+ ) {
$this->rules = [
'general.design.admin_logo.logo_image' => 'required|mimes:jpeg,bmp,png,jpg'
];
diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
index 41ac27323..61350100e 100755
--- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
+++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
@@ -234,7 +234,7 @@ class AttributeRepository extends Repository
$attribute->type == 'select'
|| $attribute->type == 'multiselect'
|| $attribute->code == 'sku'
- )) {
+ )) {
if ($attribute->options()->exists()) {
array_push($trimmed, [
'id' => $attribute->id,
diff --git a/packages/Webkul/BookingProduct/src/Helpers/Booking.php b/packages/Webkul/BookingProduct/src/Helpers/Booking.php
index 0deff259a..318921646 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/Booking.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/Booking.php
@@ -148,8 +148,8 @@ class Booking
}
return count($slots)
- ? implode(' | ', $slots)
- : '' . trans('bookingproduct::app.shop.products.closed') . '';
+ ? implode(' | ', $slots)
+ : '' . trans('bookingproduct::app.shop.products.closed') . '';
}
/**
@@ -182,12 +182,12 @@ class Booking
$currentTime = Carbon::now();
$availableFrom = ! $bookingProduct->available_from && $bookingProduct->available_from
- ? Carbon::createFromTimeString($bookingProduct->available_from)
- : clone $currentTime;
+ ? Carbon::createFromTimeString($bookingProduct->available_from)
+ : clone $currentTime;
$availableTo = ! $bookingProduct->available_from && $bookingProduct->available_to
- ? Carbon::createFromTimeString($bookingProduct->available_to)
- : Carbon::createFromTimeString('2080-01-01 00:00:00');
+ ? Carbon::createFromTimeString($bookingProduct->available_to)
+ : Carbon::createFromTimeString('2080-01-01 00:00:00');
for ($i = 0; $i < 7; $i++) {
$date = clone $currentTime;
@@ -264,16 +264,16 @@ class Booking
$currentTime = Carbon::now();
$availableFrom = ! $bookingProduct->available_every_week && $bookingProduct->available_from
- ? Carbon::createFromTimeString($bookingProduct->available_from)
- : Carbon::createFromTimeString($currentTime);
+ ? Carbon::createFromTimeString($bookingProduct->available_from)
+ : Carbon::createFromTimeString($currentTime);
$availableTo = ! $bookingProduct->available_every_week && $bookingProduct->available_from
- ? Carbon::createFromTimeString($bookingProduct->available_to)
- : Carbon::createFromTimeString('2080-01-01 00:00:00');
+ ? Carbon::createFromTimeString($bookingProduct->available_to)
+ : Carbon::createFromTimeString('2080-01-01 00:00:00');
$timeDurations = $bookingProductSlot->same_slot_all_days
- ? $bookingProductSlot->slots
- : ($bookingProductSlot->slots[$requestedDate->format('w')] ?? []);
+ ? $bookingProductSlot->slots
+ : ($bookingProductSlot->slots[$requestedDate->format('w')] ?? []);
$slots = [];
@@ -306,8 +306,8 @@ class Booking
if (($startDayTime <= $from && $from <= $availableTo)
&& ($availableTo >= $to && $to >= $startDayTime)
&& ($startDayTime <= $from && $from <= $endDayTime)
- && ($endDayTime >= $to && $to >= $startDayTime)) {
-
+ && ($endDayTime >= $to && $to >= $startDayTime)
+ ) {
// Get already ordered qty for this slot
$orderedQty = 0;
diff --git a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
index a33a5184d..595605238 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
@@ -46,7 +46,8 @@ class DefaultSlot extends Booking
if ($requestedDate < $currentTime
|| $requestedDate < $availableFrom
- || $requestedDate > $availableTo) {
+ || $requestedDate > $availableTo
+ ) {
return [];
}
@@ -144,8 +145,8 @@ class DefaultSlot extends Booking
if (($startDayTime <= $from && $from <= $availableTo)
&& ($availableTo >= $to && $to >= $startDayTime)
&& ($startDayTime <= $from && $from <= $endDayTime)
- && ($endDayTime >= $to && $to >= $startDayTime)) {
-
+ && ($endDayTime >= $to && $to >= $startDayTime)
+ ) {
// Get already ordered qty for this slot
$orderedQty = 0;
diff --git a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php
index 79e68919c..c9e11af40 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php
@@ -66,8 +66,8 @@ class RentalSlot extends Booking
if (($startDayTime <= $from && $from <= $availableTo)
&& ($availableTo >= $to && $to >= $startDayTime)
&& ($startDayTime <= $from && $from <= $endDayTime)
- && ($endDayTime >= $to && $to >= $startDayTime)) {
-
+ && ($endDayTime >= $to && $to >= $startDayTime)
+ ) {
// Get already ordered qty for this slot
$orderedQty = 0;
diff --git a/packages/Webkul/BookingProduct/src/Repositories/BookingProductRepository.php b/packages/Webkul/BookingProduct/src/Repositories/BookingProductRepository.php
index 90198f3c1..48b54566e 100644
--- a/packages/Webkul/BookingProduct/src/Repositories/BookingProductRepository.php
+++ b/packages/Webkul/BookingProduct/src/Repositories/BookingProductRepository.php
@@ -101,7 +101,9 @@ class BookingProductRepository extends Repository
$bookingProductTypeSlot = $this->typeRepositories[$data['type']]->findOneByField('booking_product_id', $id);
if (isset($data['slots'])) {
- $data['slots'] = $this->formatSlots($data);
+ $data['slots'] = $this->validateSlots(
+ $this->formatSlots($data)
+ );
}
if (! $bookingProductTypeSlot) {
@@ -142,4 +144,17 @@ class BookingProductRepository extends Repository
return $data['slots'];
}
+
+ /**
+ * @param array $data
+ * @return array
+ */
+ public function validateSlots($data)
+ {
+ foreach ($data['slots'] as $key => $timeInterval) {
+
+ }
+
+ return $data;
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php
index 41dd5b1d8..ca20c560c 100644
--- a/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php
+++ b/packages/Webkul/CatalogRule/src/Helpers/CatalogRuleProduct.php
@@ -142,7 +142,8 @@ class CatalogRuleProduct
|| ! isset($condition['value'])
|| is_null($condition['value'])
|| $condition['value'] == ''
- || in_array($condition['attribute'], $appliedAttributes)) {
+ || in_array($condition['attribute'], $appliedAttributes)
+ ) {
continue;
}
diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index 5a5cbe96b..30ce00867 100755
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -385,9 +385,9 @@ class Core
if (($targetCurrencyCode != $this->lastOrderCode)
&& ($targetCurrencyCode != $orderCurrencyCode)
&& ($orderCurrencyCode != $this->getBaseCurrencyCode())
- && ($orderCurrencyCode != $this->lastCurrencyCode)) {
-
- $amount = $this->convertToBasePrice($amount, $orderCurrencyCode);
+ && ($orderCurrencyCode != $this->lastCurrencyCode)
+ ) {
+ $amount = $this->convertToBasePrice($amount, $orderCurrencyCode);
}
}
diff --git a/packages/Webkul/Product/src/Console/Commands/PriceUpdate.php b/packages/Webkul/Product/src/Console/Commands/PriceUpdate.php
index a7fa5d5cf..44f80c634 100644
--- a/packages/Webkul/Product/src/Console/Commands/PriceUpdate.php
+++ b/packages/Webkul/Product/src/Console/Commands/PriceUpdate.php
@@ -70,13 +70,13 @@ class PriceUpdate extends Command
$product->parent->save();
} else {
$bundleProducts = $this->productFlatRepository->getModel()
- ->addSelect('product_flat.*')
- ->distinct()
- ->leftJoin('products', 'product_flat.product_id', 'products.id')
- ->leftJoin('product_bundle_options', 'products.id', 'product_bundle_options.product_id')
- ->leftJoin('product_bundle_option_products', 'product_bundle_options.id', 'product_bundle_option_productsproduct_bundle_option_id')
- ->where('product_bundle_option_products.product_id', $product->product_id)
- ->get();
+ ->addSelect('product_flat.*')
+ ->distinct()
+ ->leftJoin('products', 'product_flat.product_id', 'products.id')
+ ->leftJoin('product_bundle_options', 'products.id', 'product_bundle_options.product_id')
+ ->leftJoin('product_bundle_option_products', 'product_bundle_options.id', 'product_bundle_option_productsproduct_bundle_option_id')
+ ->where('product_bundle_option_products.product_id', $product->product_id)
+ ->get();
foreach ($bundleProducts as $bundleProduct) {
$bundleProduct->min_price = $bundleProduct->getTypeInstance()->getMinimalPrice();
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
index 1335ee42d..26a36945c 100755
--- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
@@ -142,15 +142,15 @@ class ProductController extends Controller
{
if (! request()->get('family')
&& ProductType::hasVariants(request()->input('type'))
- && request()->input('sku') != '') {
-
+ && request()->input('sku') != ''
+ ) {
return redirect(url()->current() . '?type=' . request()->input('type') . '&family=' . request()->input('attribute_family_id') . '&sku=' . request()->input('sku'));
}
if (ProductType::hasVariants(request()->input('type'))
&& (! request()->has('super_attributes')
- || ! count(request()->get('super_attributes')))) {
-
+ || ! count(request()->get('super_attributes')))
+ ) {
session()->flash('error', trans('admin::app.catalog.products.configurable-error'));
return back();
diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php
index 3ea88f43c..c1c583c64 100755
--- a/packages/Webkul/Product/src/Models/Product.php
+++ b/packages/Webkul/Product/src/Models/Product.php
@@ -259,7 +259,10 @@ class Product extends Model implements ProductContract
*/
public function getAttribute($key)
{
- if (! method_exists(static::class, $key) && ! in_array($key, ['parent_id', 'attribute_family_id']) && ! isset($this->attributes[$key])) {
+ if (! method_exists(static::class, $key)
+ && ! in_array($key, ['parent_id', 'attribute_family_id'])
+ && ! isset($this->attributes[$key])
+ ) {
if (isset($this->id)) {
$this->attributes[$key] = '';
diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php
index 905d368b7..cc7357915 100644
--- a/packages/Webkul/Product/src/Type/Bundle.php
+++ b/packages/Webkul/Product/src/Type/Bundle.php
@@ -388,8 +388,8 @@ class Bundle extends AbstractType
if ($prices['from']['regular_price']['price'] != $prices['to']['regular_price']['price']
- || $prices['from']['final_price']['price'] != $prices['to']['final_price']['price']) {
-
+ || $prices['from']['final_price']['price'] != $prices['to']['final_price']['price']
+ ) {
$priceHtml .= 'To';
if ($prices['to']['regular_price']['price'] != $prices['to']['final_price']['price']) {
diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index e639c57b5..0e22440e7 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -168,8 +168,8 @@ class InvoiceRepository extends Repository
if ($childOrderItem->product
&& ! $childOrderItem->getTypeInstance()->isStockable()
- && $childOrderItem->getTypeInstance()->showQuantityBox()) {
-
+ && $childOrderItem->getTypeInstance()->showQuantityBox()
+ ) {
$this->invoiceItemRepository->updateProductInventory([
'invoice' => $invoice,
'product' => $childOrderItem->product,
@@ -182,8 +182,8 @@ class InvoiceRepository extends Repository
}
} elseif ($orderItem->product
&& ! $orderItem->getTypeInstance()->isStockable()
- && $orderItem->getTypeInstance()->showQuantityBox()) {
-
+ && $orderItem->getTypeInstance()->showQuantityBox()
+ ) {
$this->invoiceItemRepository->updateProductInventory([
'invoice' => $invoice,
'product' => $orderItem->product,
diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
index b785f1623..f437159ad 100755
--- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
+++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
@@ -261,13 +261,14 @@ class TaxRateController extends Controller
foreach ($excelData as $data) {
foreach ($data as $column => $uploadData) {
- if (!is_null($uploadData['zip_from']) && !is_null($uploadData['zip_to'])) {
+ if (! is_null($uploadData['zip_from']) && ! is_null($uploadData['zip_to'])) {
$uploadData['is_zip'] = 1;
$uploadData['zip_code'] = NULL;
}
if (isset($rateIdentifier)) {
$id = array_search($uploadData['identifier'], $rateIdentifier);
+
if ($id) {
$this->taxRateRepository->update($uploadData, $id);
} else {
diff --git a/packages/Webkul/Theme/src/ThemeViewFinder.php b/packages/Webkul/Theme/src/ThemeViewFinder.php
index 20d160aec..f2f913103 100755
--- a/packages/Webkul/Theme/src/ThemeViewFinder.php
+++ b/packages/Webkul/Theme/src/ThemeViewFinder.php
@@ -43,7 +43,6 @@ class ThemeViewFinder extends FileViewFinder
$newPath = base_path() . '/' . $path;
$paths = Arr::prepend($paths, $newPath);
-
}
return $paths;