+ @yield('message')
+
+ -
- @foreach (array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
+ @foreach (\Illuminate\Support\Arr::get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
@endforeach
-
+
-
diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php
index 55263fea8..d6a00c84b 100755
--- a/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php
+++ b/packages/Webkul/Attribute/src/Repositories/AttributeFamilyRepository.php
@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Event;
use Webkul\Attribute\Repositories\AttributeRepository;
use Webkul\Attribute\Repositories\AttributeGroupRepository;
use Illuminate\Container\Container as App;
+use Illuminate\Support\Str;
/**
* Attribute Reposotory
@@ -66,7 +67,7 @@ class AttributeFamilyRepository extends Repository
*/
public function create(array $data)
{
- Event::fire('catalog.attribute_family.create.before');
+ Event::dispatch('catalog.attribute_family.create.before');
$attributeGroups = isset($data['attribute_groups']) ? $data['attribute_groups'] : [];
unset($data['attribute_groups']);
@@ -88,7 +89,7 @@ class AttributeFamilyRepository extends Repository
}
}
- Event::fire('catalog.attribute_family.create.after', $family);
+ Event::dispatch('catalog.attribute_family.create.after', $family);
return $family;
}
@@ -103,7 +104,7 @@ class AttributeFamilyRepository extends Repository
{
$family = $this->find($id);
- Event::fire('catalog.attribute_family.update.before', $id);
+ Event::dispatch('catalog.attribute_family.update.before', $id);
$family->update($data);
@@ -111,7 +112,7 @@ class AttributeFamilyRepository extends Repository
if (isset($data['attribute_groups'])) {
foreach ($data['attribute_groups'] as $attributeGroupId => $attributeGroupInputs) {
- if (str_contains($attributeGroupId, 'group_')) {
+ if (Str::contains($attributeGroupId, 'group_')) {
$attributeGroup = $family->attribute_groups()->create($attributeGroupInputs);
if (isset($attributeGroupInputs['custom_attributes'])) {
@@ -152,7 +153,7 @@ class AttributeFamilyRepository extends Repository
$this->attributeGroupRepository->delete($attributeGroupId);
}
- Event::fire('catalog.attribute_family.update.after', $family);
+ Event::dispatch('catalog.attribute_family.update.after', $family);
return $family;
}
@@ -181,10 +182,10 @@ class AttributeFamilyRepository extends Repository
*/
public function delete($id)
{
- Event::fire('catalog.attribute_family.delete.before', $id);
+ Event::dispatch('catalog.attribute_family.delete.before', $id);
parent::delete($id);
- Event::fire('catalog.attribute_family.delete.after', $id);
+ Event::dispatch('catalog.attribute_family.delete.after', $id);
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
index 816a30e5b..1f6dffc56 100755
--- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
+++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
@@ -6,6 +6,7 @@ use Webkul\Core\Eloquent\Repository;
use Illuminate\Support\Facades\Event;
use Webkul\Attribute\Repositories\AttributeOptionRepository;
use Illuminate\Container\Container as App;
+use Illuminate\Support\Str;
/**
* Attribute Reposotory
@@ -54,7 +55,7 @@ class AttributeRepository extends Repository
*/
public function create(array $data)
{
- Event::fire('catalog.attribute.create.before');
+ Event::dispatch('catalog.attribute.create.before');
$data = $this->validateUserInput($data);
@@ -70,7 +71,7 @@ class AttributeRepository extends Repository
}
}
- Event::fire('catalog.attribute.create.after', $attribute);
+ Event::dispatch('catalog.attribute.create.after', $attribute);
return $attribute;
}
@@ -87,7 +88,7 @@ class AttributeRepository extends Repository
$attribute = $this->find($id);
- Event::fire('catalog.attribute.update.before', $id);
+ Event::dispatch('catalog.attribute.update.before', $id);
$attribute->update($data);
@@ -96,7 +97,7 @@ class AttributeRepository extends Repository
if (in_array($attribute->type, ['select', 'multiselect', 'checkbox'])) {
if (isset($data['options'])) {
foreach ($data['options'] as $optionId => $optionInputs) {
- if (str_contains($optionId, 'option_')) {
+ if (Str::contains($optionId, 'option_')) {
$this->attributeOptionRepository->create(array_merge([
'attribute_id' => $attribute->id,
], $optionInputs));
@@ -115,7 +116,7 @@ class AttributeRepository extends Repository
$this->attributeOptionRepository->delete($optionId);
}
- Event::fire('catalog.attribute.update.after', $attribute);
+ Event::dispatch('catalog.attribute.update.after', $attribute);
return $attribute;
}
@@ -126,11 +127,11 @@ class AttributeRepository extends Repository
*/
public function delete($id)
{
- Event::fire('catalog.attribute.delete.before', $id);
+ Event::dispatch('catalog.attribute.delete.before', $id);
parent::delete($id);
- Event::fire('catalog.attribute.delete.after', $id);
+ Event::dispatch('catalog.attribute.delete.after', $id);
}
/**
diff --git a/packages/Webkul/CMS/src/Repositories/CmsRepository.php b/packages/Webkul/CMS/src/Repositories/CmsRepository.php
index 0a9da50f3..0c5e0812f 100644
--- a/packages/Webkul/CMS/src/Repositories/CmsRepository.php
+++ b/packages/Webkul/CMS/src/Repositories/CmsRepository.php
@@ -31,7 +31,7 @@ class CmsRepository extends Repository
*/
public function create(array $data)
{
- Event::fire('cms.pages.create.before');
+ Event::dispatch('cms.pages.create.before');
$model = $this->getModel();
@@ -46,7 +46,7 @@ class CmsRepository extends Repository
$page->channels()->sync($data['channels']);
- Event::fire('cms.pages.create.after', $page);
+ Event::dispatch('cms.pages.create.after', $page);
return $page;
}
@@ -61,13 +61,13 @@ class CmsRepository extends Repository
{
$page = $this->find($id);
- Event::fire('cms.pages.update.before', $id);
+ Event::dispatch('cms.pages.update.before', $id);
parent::update($data, $id, $attribute);
$page->channels()->sync($data['channels']);
- Event::fire('cms.pages.update.after', $id);
+ Event::dispatch('cms.pages.update.after', $id);
return $page;
}
diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php
index dc90a01b5..0e74172ac 100644
--- a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php
+++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php
@@ -97,11 +97,11 @@ class CartRuleController extends Controller
$data = request()->all();
- Event::fire('promotions.cart_rule.create.before');
+ Event::dispatch('promotions.cart_rule.create.before');
$cartRule = $this->cartRuleRepository->create($data);
- Event::fire('promotions.cart_rule.create.after', $cartRule);
+ Event::dispatch('promotions.cart_rule.create.after', $cartRule);
session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Cart Rule']));
@@ -145,11 +145,11 @@ class CartRuleController extends Controller
$cartRule = $this->cartRuleRepository->findOrFail($id);
- Event::fire('promotions.cart_rule.update.before', $cartRule);
+ Event::dispatch('promotions.cart_rule.update.before', $cartRule);
$cartRule = $this->cartRuleRepository->update(request()->all(), $id);
- Event::fire('promotions.cart_rule.update.after', $cartRule);
+ Event::dispatch('promotions.cart_rule.update.after', $cartRule);
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Cart Rule']));
@@ -167,11 +167,11 @@ class CartRuleController extends Controller
$cartRule = $this->cartRuleRepository->findOrFail($id);
try {
- Event::fire('promotions.cart_rule.delete.before', $id);
+ Event::dispatch('promotions.cart_rule.delete.before', $id);
$this->cartRuleRepository->delete($id);
- Event::fire('promotions.cart_rule.delete.after', $id);
+ Event::dispatch('promotions.cart_rule.delete.after', $id);
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Cart Rule']));
diff --git a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php
index 3bcceb50f..41b34e7b0 100644
--- a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php
+++ b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php
@@ -94,11 +94,11 @@ class CatalogRuleController extends Controller
$data = request()->all();
- Event::fire('promotions.catalog_rule.create.before');
+ Event::dispatch('promotions.catalog_rule.create.before');
$catalogRule = $this->catalogRuleRepository->create($data);
- Event::fire('promotions.catalog_rule.create.after', $catalogRule);
+ Event::dispatch('promotions.catalog_rule.create.after', $catalogRule);
$this->catalogRuleIndexHelper->reindexComplete();
@@ -141,11 +141,11 @@ class CatalogRuleController extends Controller
$catalogRule = $this->catalogRuleRepository->findOrFail($id);
- Event::fire('promotions.catalog_rule.update.before', $catalogRule);
+ Event::dispatch('promotions.catalog_rule.update.before', $catalogRule);
$catalogRule = $this->catalogRuleRepository->update(request()->all(), $id);
- Event::fire('promotions.catalog_rule.update.after', $catalogRule);
+ Event::dispatch('promotions.catalog_rule.update.after', $catalogRule);
$this->catalogRuleIndexHelper->reindexComplete();
@@ -165,11 +165,11 @@ class CatalogRuleController extends Controller
$catalogRule = $this->catalogRuleRepository->findOrFail($id);
try {
- Event::fire('promotions.catalog_rule.delete.before', $id);
+ Event::dispatch('promotions.catalog_rule.delete.before', $id);
$this->catalogRuleRepository->delete($id);
- Event::fire('promotions.catalog_rule.delete.after', $id);
+ Event::dispatch('promotions.catalog_rule.delete.after', $id);
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Catalog Rule']));
diff --git a/packages/Webkul/Category/src/Database/Factories/CategoryFactory.php b/packages/Webkul/Category/src/Database/Factories/CategoryFactory.php
index 941601997..359cae23c 100644
--- a/packages/Webkul/Category/src/Database/Factories/CategoryFactory.php
+++ b/packages/Webkul/Category/src/Database/Factories/CategoryFactory.php
@@ -1,10 +1,9 @@
define(Category::class, function (Faker $faker, array $attributes) {
return [
diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
index 418788379..2b8c6a387 100755
--- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
@@ -115,15 +115,15 @@ class CategoryController extends Controller
/**
* Show the form for editing the specified resource.
*
- * @param int $id
+ * @param int $id
* @return \Illuminate\View\View
*/
public function edit($id)
{
- $categories = $this->categoryRepository->getCategoryTree($id);
-
$category = $this->categoryRepository->findOrFail($id);
+ $categories = $this->categoryRepository->getCategoryTreeWithoutDescendant($id);
+
$attributes = $this->attributeRepository->findWhere(['is_filterable' => 1]);
return view($this->_config['view'], compact('category', 'categories', 'attributes'));
@@ -174,7 +174,7 @@ class CategoryController extends Controller
$this->categoryRepository->delete($id);
- Event::fire('catalog.category.delete.after', $id);
+ Event::dispatch('catalog.category.delete.after', $id);
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Category']));
@@ -200,11 +200,11 @@ class CategoryController extends Controller
foreach ($indexes as $key => $value) {
try {
- Event::fire('catalog.category.delete.before', $value);
+ Event::dispatch('catalog.category.delete.before', $value);
$this->categoryRepository->delete($value);
- Event::fire('catalog.category.delete.after', $value);
+ Event::dispatch('catalog.category.delete.after', $value);
} catch(\Exception $e) {
$suppressFlash = true;
diff --git a/packages/Webkul/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php
index b40ff1a77..1f3bc56ca 100755
--- a/packages/Webkul/Category/src/Models/Category.php
+++ b/packages/Webkul/Category/src/Models/Category.php
@@ -5,8 +5,10 @@ namespace Webkul\Category\Models;
use Webkul\Core\Eloquent\TranslatableModel;
use Kalnoy\Nestedset\NodeTrait;
use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Webkul\Category\Contracts\Category as CategoryContract;
use Webkul\Attribute\Models\AttributeProxy;
+use Webkul\Category\Repositories\CategoryRepository;
/**
* Class Category
@@ -19,7 +21,7 @@ class Category extends TranslatableModel implements CategoryContract
{
use NodeTrait;
- public $translatedAttributes = ['name', 'description', 'slug', 'meta_title', 'meta_description', 'meta_keywords'];
+ public $translatedAttributes = ['name', 'description', 'slug', 'url_path', 'meta_title', 'meta_description', 'meta_keywords'];
protected $fillable = ['position', 'status', 'display_mode', 'parent_id'];
@@ -51,4 +53,63 @@ class Category extends TranslatableModel implements CategoryContract
{
return $this->belongsToMany(AttributeProxy::modelClass(), 'category_filterable_attributes')->with('options');
}
+
+ /**
+ * Getting the root category of a category
+ *
+ * @return Category
+ */
+ public function getRootCategory(): Category
+ {
+ return Category::where([
+ ['parent_id', '=', null],
+ ['_lft', '<=', $this->_lft],
+ ['_rgt', '>=', $this->_rgt],
+ ])->first();
+ }
+
+ /**
+ * Returns all categories within the category's path
+ *
+ * @return Category[]
+ */
+ public function getPathCategories(): array
+ {
+ $category = $this->findInTree();
+
+ $categories = [$category];
+
+ while (isset($category->parent)) {
+ $category = $category->parent;
+ $categories[] = $category;
+ }
+
+ return array_reverse($categories);
+ }
+
+ /**
+ * Finds and returns the category within a nested category tree
+ * will search in root category by default
+ * is used to minimize the numbers of sql queries for it only uses the already cached tree
+ *
+ * @param Category[] $categoryTree
+ * @return Category
+ */
+ public function findInTree($categoryTree = null): Category
+ {
+ if (! $categoryTree) {
+ $categoryTree = app(CategoryRepository::class)->getVisibleCategoryTree($this->getRootCategory()->id);
+ }
+
+ $category = $categoryTree->first();
+
+ if (! $category) {
+ throw new NotFoundHttpException('category not found in tree');
+ }
+
+ if ($category->id === $this->id) {
+ return $category;
+ }
+ return $this->findInTree($category->children);
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
index fd728487a..4cafd2f50 100755
--- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
@@ -9,6 +9,7 @@ use Webkul\Core\Eloquent\Repository;
use Webkul\Category\Models\Category;
use Webkul\Category\Models\CategoryTranslation;
use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Support\Facades\DB;
/**
* Category Reposotory
@@ -34,7 +35,7 @@ class CategoryRepository extends Repository
*/
public function create(array $data)
{
- Event::fire('catalog.category.create.before');
+ Event::dispatch('catalog.category.create.before');
if (isset($data['locale']) && $data['locale'] == 'all') {
$model = app()->make($this->model());
@@ -57,7 +58,7 @@ class CategoryRepository extends Repository
$category->filterableAttributes()->sync($data['attributes']);
}
- Event::fire('catalog.category.create.after', $category);
+ Event::dispatch('catalog.category.create.after', $category);
return $category;
}
@@ -75,6 +76,18 @@ class CategoryRepository extends Repository
: $this->model::orderBy('position', 'ASC')->get()->toTree();
}
+ /**
+ * Specify category tree
+ *
+ * @param integer $id
+ * @return mixed
+ */
+ public function getCategoryTreeWithoutDescendant($id = null)
+ {
+ return $id
+ ? $this->model::orderBy('position', 'ASC')->where('id', '!=', $id)->whereNotDescendantOf($id)->get()->toTree()
+ : $this->model::orderBy('position', 'ASC')->get()->toTree();
+ }
/**
* Get root categories
@@ -116,7 +129,7 @@ class CategoryRepository extends Repository
$exists = CategoryTranslation::where('category_id', '<>', $id)
->where('slug', $slug)
->limit(1)
- ->select(\DB::raw(1))
+ ->select(DB::raw(1))
->exists();
return $exists ? false : true;
@@ -161,7 +174,7 @@ class CategoryRepository extends Repository
{
$category = $this->find($id);
- Event::fire('catalog.category.update.before', $id);
+ Event::dispatch('catalog.category.update.before', $id);
$category->update($data);
@@ -171,7 +184,7 @@ class CategoryRepository extends Repository
$category->filterableAttributes()->sync($data['attributes']);
}
- Event::fire('catalog.category.update.after', $id);
+ Event::dispatch('catalog.category.update.after', $id);
return $category;
}
@@ -182,11 +195,11 @@ class CategoryRepository extends Repository
*/
public function delete($id)
{
- Event::fire('catalog.category.delete.before', $id);
+ Event::dispatch('catalog.category.delete.before', $id);
parent::delete($id);
- Event::fire('catalog.category.delete.after', $id);
+ Event::dispatch('catalog.category.delete.after', $id);
}
/**
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 729b32bdb..8b3ae7993 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -12,6 +12,7 @@ use Webkul\Checkout\Models\CartPayment;
use Webkul\Customer\Repositories\WishlistRepository;
use Webkul\Customer\Repositories\CustomerAddressRepository;
use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Arr;
/**
* Facades handler for all the methods to be implemented in Cart.
@@ -131,7 +132,7 @@ class Cart {
*/
public function addProduct($productId, $data)
{
- Event::fire('checkout.cart.add.before', $productId);
+ Event::dispatch('checkout.cart.add.before', $productId);
$cart = $this->getCart();
@@ -170,7 +171,7 @@ class Cart {
}
}
- Event::fire('checkout.cart.add.after', $cart);
+ Event::dispatch('checkout.cart.add.after', $cart);
$this->collectTotals();
@@ -244,7 +245,7 @@ class Cart {
if (! $this->isItemHaveQuantity($item))
throw new \Exception(trans('shop::app.checkout.cart.quantity.inventory_warning'));
- Event::fire('checkout.cart.update.before', $item);
+ Event::dispatch('checkout.cart.update.before', $item);
$this->cartItemRepository->update([
'quantity' => $quantity,
@@ -254,7 +255,7 @@ class Cart {
'base_total_weight' => $item->weight * $quantity
], $itemId);
- Event::fire('checkout.cart.update.after', $item);
+ Event::dispatch('checkout.cart.update.after', $item);
}
$this->collectTotals();
@@ -292,7 +293,7 @@ class Cart {
*/
public function removeItem($itemId)
{
- Event::fire('checkout.cart.delete.before', $itemId);
+ Event::dispatch('checkout.cart.delete.before', $itemId);
if (! $cart = $this->getCart())
return false;
@@ -308,7 +309,7 @@ class Cart {
}
}
- Event::fire('checkout.cart.delete.after', $itemId);
+ Event::dispatch('checkout.cart.delete.after', $itemId);
$this->collectTotals();
@@ -614,7 +615,7 @@ class Cart {
if (! $cart = $this->getCart())
return false;
- Event::fire('checkout.cart.collect.totals.before', $cart);
+ Event::dispatch('checkout.cart.collect.totals.before', $cart);
$this->calculateItemsTax();
@@ -657,7 +658,7 @@ class Cart {
$cart->save();
- Event::fire('checkout.cart.collect.totals.after', $cart);
+ Event::dispatch('checkout.cart.collect.totals.after', $cart);
}
/**
@@ -847,8 +848,8 @@ class Cart {
'applied_cart_rule_ids' => $data['applied_cart_rule_ids'],
'discount_amount' => $data['discount_amount'],
'base_discount_amount' => $data['base_discount_amount'],
- 'billing_address' => array_except($data['billing_address'], ['id', 'cart_id']),
- 'payment' => array_except($data['payment'], ['id', 'cart_id']),
+ 'billing_address' => Arr::except($data['billing_address'], ['id', 'cart_id']),
+ 'payment' => Arr::except($data['payment'], ['id', 'cart_id']),
'channel' => core()->getCurrentChannel(),
];
@@ -859,9 +860,9 @@ class Cart {
'shipping_description' => $data['selected_shipping_rate']['method_description'],
'shipping_amount' => $data['selected_shipping_rate']['price'],
'base_shipping_amount' => $data['selected_shipping_rate']['base_price'],
+ 'shipping_address' => Arr::except($data['shipping_address'], ['id', 'cart_id']),
'shipping_discount_amount' => $data['selected_shipping_rate']['discount_amount'],
'base_shipping_discount_amount' => $data['selected_shipping_rate']['base_discount_amount'],
- 'shipping_address' => array_except($data['shipping_address'], ['id', 'cart_id']),
]);
}
diff --git a/packages/Webkul/Core/src/Eloquent/Repository.php b/packages/Webkul/Core/src/Eloquent/Repository.php
index b5ef37809..f274b2d62 100755
--- a/packages/Webkul/Core/src/Eloquent/Repository.php
+++ b/packages/Webkul/Core/src/Eloquent/Repository.php
@@ -82,18 +82,28 @@ abstract class Repository extends BaseRepository {
return $this->parserResult($model);
}
- /**
- * @return mixed
+ /**
+ * Count results of repository
+ *
+ * @param array $where
+ * @param string $columns
+ *
+ * @return int
*/
- public function count()
+ public function count(array $where = [], $columns = '*')
{
$this->applyCriteria();
$this->applyScope();
- $total = $this->model->count();
- $this->resetModel();
+ if ($where) {
+ $this->applyConditions($where);
+ }
- return $total;
+ $result = $this->model->count($columns);
+ $this->resetModel();
+ $this->resetScope();
+
+ return $result;
}
/**
diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
index 602c80449..2c313a072 100755
--- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
@@ -96,11 +96,11 @@ class ChannelController extends Controller
unset($data['seo']);
- Event::fire('core.channel.create.before');
+ Event::dispatch('core.channel.create.before');
$channel = $this->channelRepository->create($data);
- Event::fire('core.channel.create.after', $channel);
+ Event::dispatch('core.channel.create.after', $channel);
session()->flash('success', trans('admin::app.settings.channels.create-success'));
@@ -153,11 +153,11 @@ class ChannelController extends Controller
$data['home_seo'] = json_encode($data['seo']);
- Event::fire('core.channel.update.before', $id);
+ Event::dispatch('core.channel.update.before', $id);
$channel = $this->channelRepository->update($data, $id);
- Event::fire('core.channel.update.after', $channel);
+ Event::dispatch('core.channel.update.after', $channel);
session()->flash('success', trans('admin::app.settings.channels.update-success'));
@@ -178,11 +178,11 @@ class ChannelController extends Controller
session()->flash('error', trans('admin::app.settings.channels.last-delete-error'));
} else {
try {
- Event::fire('core.channel.delete.before', $id);
+ Event::dispatch('core.channel.delete.before', $id);
$this->channelRepository->delete($id);
- Event::fire('core.channel.delete.after', $id);
+ Event::dispatch('core.channel.delete.after', $id);
session()->flash('success', trans('admin::app.settings.channels.delete-success'));
diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
index 4416eda0b..9f553068f 100755
--- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
@@ -72,11 +72,11 @@ class CurrencyController extends Controller
'name' => 'required'
]);
- Event::fire('core.channel.create.before');
+ Event::dispatch('core.channel.create.before');
$currency = $this->currencyRepository->create(request()->all());
- Event::fire('core.currency.create.after', $currency);
+ Event::dispatch('core.currency.create.after', $currency);
session()->flash('success', trans('admin::app.settings.currencies.create-success'));
@@ -109,11 +109,11 @@ class CurrencyController extends Controller
'name' => 'required'
]);
- Event::fire('core.currency.update.before', $id);
+ Event::dispatch('core.currency.update.before', $id);
$currency = $this->currencyRepository->update(request()->all(), $id);
- Event::fire('core.currency.update.after', $currency);
+ Event::dispatch('core.currency.update.after', $currency);
session()->flash('success', trans('admin::app.settings.currencies.update-success'));
@@ -134,11 +134,11 @@ class CurrencyController extends Controller
session()->flash('warning', trans('admin::app.settings.currencies.last-delete-error'));
} else {
try {
- Event::fire('core.currency.delete.before', $id);
+ Event::dispatch('core.currency.delete.before', $id);
$this->currencyRepository->delete($id);
- Event::fire('core.currency.delete.after', $id);
+ Event::dispatch('core.currency.delete.after', $id);
session()->flash('success', trans('admin::app.settings.currencies.delete-success'));
@@ -164,11 +164,11 @@ class CurrencyController extends Controller
foreach ($indexes as $key => $value) {
try {
- Event::fire('core.currency.delete.before', $value);
+ Event::dispatch('core.currency.delete.before', $value);
$this->currencyRepository->delete($value);
- Event::fire('core.currency.delete.after', $value);
+ Event::dispatch('core.currency.delete.after', $value);
} catch(\Exception $e) {
$suppressFlash = true;
diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
index 022abbebe..cf05243c2 100755
--- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
@@ -23,7 +23,7 @@ class ExchangeRateController extends Controller
/**
* ExchangeRateRepository instance
- *
+ *
* @var Object
*/
protected $exchangeRateRepository;
@@ -90,11 +90,11 @@ class ExchangeRateController extends Controller
'rate' => 'required|numeric'
]);
- Event::fire('core.exchange_rate.create.before');
+ Event::dispatch('core.exchange_rate.create.before');
$exchangeRate = $this->exchangeRateRepository->create(request()->all());
- Event::fire('core.exchange_rate.create.after', $exchangeRate);
+ Event::dispatch('core.exchange_rate.create.after', $exchangeRate);
session()->flash('success', trans('admin::app.settings.exchange_rates.create-success'));
@@ -129,11 +129,11 @@ class ExchangeRateController extends Controller
'rate' => 'required|numeric'
]);
- Event::fire('core.exchange_rate.update.before', $id);
+ Event::dispatch('core.exchange_rate.update.before', $id);
$exchangeRate = $this->exchangeRateRepository->update(request()->all(), $id);
- Event::fire('core.exchange_rate.update.after', $exchangeRate);
+ Event::dispatch('core.exchange_rate.update.after', $exchangeRate);
session()->flash('success', trans('admin::app.settings.exchange_rates.update-success'));
@@ -190,13 +190,13 @@ class ExchangeRateController extends Controller
session()->flash('error', trans('admin::app.settings.exchange_rates.last-delete-error'));
} else {
try {
- Event::fire('core.exchange_rate.delete.before', $id);
+ Event::dispatch('core.exchange_rate.delete.before', $id);
$this->exchangeRateRepository->delete($id);
session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success'));
- Event::fire('core.exchange_rate.delete.after', $id);
+ Event::dispatch('core.exchange_rate.delete.after', $id);
return response()->json(['message' => true], 200);
} catch (\Exception $e) {
diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
index 2b95866d7..68fcd8b7e 100755
--- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
@@ -73,11 +73,11 @@ class LocaleController extends Controller
'direction' => 'in:ltr,rtl'
]);
- Event::fire('core.locale.create.before');
+ Event::dispatch('core.locale.create.before');
$locale = $this->localeRepository->create(request()->all());
- Event::fire('core.locale.create.after', $locale);
+ Event::dispatch('core.locale.create.after', $locale);
session()->flash('success', trans('admin::app.settings.locales.create-success'));
@@ -111,11 +111,11 @@ class LocaleController extends Controller
'direction' => 'in:ltr,rtl'
]);
- Event::fire('core.locale.update.before', $id);
+ Event::dispatch('core.locale.update.before', $id);
$locale = $this->localeRepository->update(request()->all(), $id);
- Event::fire('core.locale.update.after', $locale);
+ Event::dispatch('core.locale.update.after', $locale);
session()->flash('success', trans('admin::app.settings.locales.update-success'));
@@ -136,11 +136,11 @@ class LocaleController extends Controller
session()->flash('error', trans('admin::app.settings.locales.last-delete-error'));
} else {
try {
- Event::fire('core.locale.delete.before', $id);
+ Event::dispatch('core.locale.delete.before', $id);
$this->localeRepository->delete($id);
- Event::fire('core.locale.delete.after', $id);
+ Event::dispatch('core.locale.delete.after', $id);
session()->flash('success', trans('admin::app.settings.locales.delete-success'));
diff --git a/packages/Webkul/Core/src/Repositories/SliderRepository.php b/packages/Webkul/Core/src/Repositories/SliderRepository.php
index 1fa6f6ea1..b1c808fd5 100755
--- a/packages/Webkul/Core/src/Repositories/SliderRepository.php
+++ b/packages/Webkul/Core/src/Repositories/SliderRepository.php
@@ -7,6 +7,7 @@ use Webkul\Core\Eloquent\Repository;
use Illuminate\Support\Facades\Event;
use Illuminate\Container\Container as App;
use Webkul\Core\Repositories\ChannelRepository;
+use Illuminate\Support\Arr;
/**
* Slider Repository
@@ -55,7 +56,7 @@ class SliderRepository extends Repository
*/
public function save(array $data)
{
- Event::fire('core.settings.slider.create.before', $data);
+ Event::dispatch('core.settings.slider.create.before', $data);
$channelName = $this->channelRepository->find($data['channel_id'])->name;
@@ -65,7 +66,7 @@ class SliderRepository extends Repository
$image = false;
if (isset($data['image'])) {
- $image = $first = array_first($data['image'], function ($value, $key) {
+ $image = $first = Arr::first($data['image'], function ($value, $key) {
if ($value)
return $value;
else
@@ -87,7 +88,7 @@ class SliderRepository extends Repository
$slider = $this->create($data);
- Event::fire('core.settings.slider.create.after', $slider);
+ Event::dispatch('core.settings.slider.create.after', $slider);
return true;
}
@@ -98,7 +99,7 @@ class SliderRepository extends Repository
*/
public function updateItem(array $data, $id)
{
- Event::fire('core.settings.slider.update.before', $id);
+ Event::dispatch('core.settings.slider.update.before', $id);
$channelName = $this->channelRepository->find($data['channel_id'])->name;
@@ -107,7 +108,7 @@ class SliderRepository extends Repository
$uploaded = $image = false;
if (isset($data['image'])) {
- $image = $first = array_first($data['image'], function ($value, $key) {
+ $image = $first = Arr::first($data['image'], function ($value, $key) {
return $value ? $value : false;
});
}
@@ -130,7 +131,7 @@ class SliderRepository extends Repository
$slider = $this->update($data, $id);
- Event::fire('core.settings.slider.update.after', $slider);
+ Event::dispatch('core.settings.slider.update.after', $slider);
return true;
}
diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
index b7fefec45..63580b940 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
@@ -26,7 +26,8 @@ class AddressController extends Controller
/**
* CustomerAddressRepository object
*
- * @param \Webkul\Customer\Repositories\CustomerAddressRepository $customerAddressRepository
+ * @param \Webkul\Customer\Repositories\CustomerAddressRepository $customerAddressRepository
+ *
* @var Object
*/
protected $customerAddressRepository;
@@ -59,7 +60,9 @@ class AddressController extends Controller
*/
public function create()
{
- return view($this->_config['view']);
+ return view($this->_config['view'], [
+ 'defaultCountry' => config('app.default_country'),
+ ]);
}
/**
@@ -75,11 +78,11 @@ class AddressController extends Controller
$this->validate(request(), [
'address1' => 'string|required',
- 'country' => 'string|required',
- 'state' => 'string|required',
- 'city' => 'string|required',
+ 'country' => 'string|required',
+ 'state' => 'string|required',
+ 'city' => 'string|required',
'postcode' => 'required',
- 'phone' => 'required'
+ 'phone' => 'required',
]);
$cust_id['customer_id'] = $this->customer->id;
@@ -108,14 +111,18 @@ class AddressController extends Controller
public function edit($id)
{
$address = $this->customerAddressRepository->findOneWhere([
- 'id' => $id,
- 'customer_id' => auth()->guard('customer')->user()->id
+ 'id' => $id,
+ 'customer_id' => auth()->guard('customer')->user()->id,
]);
- if (! $address)
+ if (! $address) {
abort(404);
+ }
- return view($this->_config['view'], compact('address'));
+ return view($this->_config['view'], array_merge(
+ compact('address'),
+ ['defaultCountry' => config('app.default_country')]
+ ));
}
/**
@@ -130,18 +137,18 @@ class AddressController extends Controller
$this->validate(request(), [
'address1' => 'string|required',
- 'country' => 'string|required',
- 'state' => 'string|required',
- 'city' => 'string|required',
+ 'country' => 'string|required',
+ 'state' => 'string|required',
+ 'city' => 'string|required',
'postcode' => 'required',
- 'phone' => 'required'
+ 'phone' => 'required',
]);
$data = collect(request()->input())->except('_token')->toArray();
$addresses = $this->customer->addresses;
- foreach($addresses as $address) {
+ foreach ($addresses as $address) {
if ($id == $address->id) {
session()->flash('success', trans('shop::app.customer.account.address.edit.success'));
@@ -157,7 +164,8 @@ class AddressController extends Controller
}
/**
- * To change the default address or make the default address, by default when first address is created will be the default address
+ * To change the default address or make the default address, by default when first address is
+ * created will be the default address
*
* @return Response
*/
@@ -185,8 +193,8 @@ class AddressController extends Controller
public function destroy($id)
{
$address = $this->customerAddressRepository->findOneWhere([
- 'id' => $id,
- 'customer_id' => auth()->guard('customer')->user()->id
+ 'id' => $id,
+ 'customer_id' => auth()->guard('customer')->user()->id,
]);
if (! $address)
diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index 620fb733a..7d33eb61b 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -98,11 +98,11 @@ class RegistrationController extends Controller
$verificationData['token'] = md5(uniqid(rand(), true));
$data['token'] = $verificationData['token'];
- Event::fire('customer.registration.before');
+ Event::dispatch('customer.registration.before');
$customer = $this->customerRepository->create($data);
- Event::fire('customer.registration.after', $customer);
+ Event::dispatch('customer.registration.after', $customer);
if ($customer) {
if (core()->getConfigData('customer.settings.email.verification')) {
diff --git a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
index 0c25bb54b..05f43a5ff 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/SessionController.php
@@ -85,7 +85,7 @@ class SessionController extends Controller
}
//Event passed to prepare cart after login
- Event::fire('customer.after.login', request('email'));
+ Event::dispatch('customer.after.login', request('email'));
return redirect()->intended(route($this->_config['redirect']));
}
@@ -100,7 +100,7 @@ class SessionController extends Controller
{
auth()->guard('customer')->logout();
- Event::fire('customer.after.logout', $id);
+ Event::dispatch('customer.after.logout', $id);
return redirect()->route($this->_config['redirect']);
}
diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
index 7ffb33f80..f9362e68d 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
@@ -170,7 +170,7 @@ class WishlistController extends Controller
} catch (\Exception $e) {
session()->flash('warning', $e->getMessage());
- return redirect()->route('shop.productOrCategory.index', ['slug' => $wishlistItem->product->url_key]);
+ return redirect()->route('shop.productOrCategory.index', ['slugOrPath' => $wishlistItem->product->url_key]);
}
}
diff --git a/packages/Webkul/Customer/src/Mail/RegistrationEmail.php b/packages/Webkul/Customer/src/Mail/RegistrationEmail.php
index a93424b53..624d9fabe 100644
--- a/packages/Webkul/Customer/src/Mail/RegistrationEmail.php
+++ b/packages/Webkul/Customer/src/Mail/RegistrationEmail.php
@@ -31,7 +31,6 @@ class RegistrationEmail extends Mailable
public function build()
{
return $this->to($this->data['email'])
- ->from(config('mail.from'))
->subject(trans('shop::app.mail.customer.registration.customer-registration'))
->view('shop::emails.customer.registration')->with('data', $this->data);
}
diff --git a/packages/Webkul/Customer/src/Mail/VerificationEmail.php b/packages/Webkul/Customer/src/Mail/VerificationEmail.php
index 6f987bd3b..99f7a5eea 100755
--- a/packages/Webkul/Customer/src/Mail/VerificationEmail.php
+++ b/packages/Webkul/Customer/src/Mail/VerificationEmail.php
@@ -31,7 +31,6 @@ class VerificationEmail extends Mailable
public function build()
{
return $this->to($this->verificationData['email'])
- ->from(config('mail.from'))
->subject(trans('shop::app.mail.customer.verification.subject'))
->view('shop::emails.customer.verification-email')->with('data', ['email' => $this->verificationData['email'], 'token' => $this->verificationData['token']]);
}
diff --git a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php
index ddb4e1956..07a7e6d3a 100755
--- a/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php
+++ b/packages/Webkul/Customer/src/Notifications/CustomerResetPassword.php
@@ -21,7 +21,6 @@ class CustomerResetPassword extends ResetPassword
}
return (new MailMessage)
- ->from(config('mail.from'))
->subject(__('shop::app.mail.forget-password.subject') )
->view('shop::emails.customer.forget-password', [
'user_name' => $notifiable->name,
diff --git a/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php
index 367e963d4..cb515af94 100755
--- a/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php
+++ b/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php
@@ -31,7 +31,7 @@ class CustomerAddressRepository extends Repository
*/
public function create(array $data)
{
- Event::fire('customer.addresses.create.before');
+ Event::dispatch('customer.addresses.create.before');
if ( isset($data['default_address']) ) {
$data['default_address'] = 1;
@@ -47,7 +47,7 @@ class CustomerAddressRepository extends Repository
$address = $this->model->create($data);
- Event::fire('customer.addresses.create.after', $address);
+ Event::dispatch('customer.addresses.create.after', $address);
return $address;
}
@@ -61,7 +61,7 @@ class CustomerAddressRepository extends Repository
{
$address = $this->find($id);
- Event::fire('customer.addresses.update.before', $id);
+ Event::dispatch('customer.addresses.update.before', $id);
if (isset($data['default_address']) ) {
$data['default_address'] = 1;
@@ -80,8 +80,8 @@ class CustomerAddressRepository extends Repository
$address->update($data);
}
- Event::fire('customer.addresses.update.after', $id);
+ Event::dispatch('customer.addresses.update.after', $id);
return $address;
- }
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
index c8e8cbb05..a01730c56 100755
--- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
+++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
@@ -84,11 +84,11 @@ class InventorySourceController extends Controller
$data['status'] = !isset($data['status']) ? 0 : 1;
- Event::fire('inventory.inventory_source.create.before');
+ Event::dispatch('inventory.inventory_source.create.before');
$inventorySource = $this->inventorySourceRepository->create($data);
- Event::fire('inventory.inventory_source.create.after', $inventorySource);
+ Event::dispatch('inventory.inventory_source.create.after', $inventorySource);
session()->flash('success', trans('admin::app.settings.inventory_sources.create-success'));
@@ -133,11 +133,11 @@ class InventorySourceController extends Controller
$data['status'] = !isset($data['status']) ? 0 : 1;
- Event::fire('inventory.inventory_source.update.before', $id);
+ Event::dispatch('inventory.inventory_source.update.before', $id);
$inventorySource = $this->inventorySourceRepository->update($data, $id);
- Event::fire('inventory.inventory_source.update.after', $inventorySource);
+ Event::dispatch('inventory.inventory_source.update.after', $inventorySource);
session()->flash('success', trans('admin::app.settings.inventory_sources.update-success'));
@@ -158,11 +158,11 @@ class InventorySourceController extends Controller
session()->flash('error', trans('admin::app.settings.inventory_sources.last-delete-error'));
} else {
try {
- Event::fire('inventory.inventory_source.delete.before', $id);
+ Event::dispatch('inventory.inventory_source.delete.before', $id);
$this->inventorySourceRepository->delete($id);
- Event::fire('inventory.inventory_source.delete.after', $id);
+ Event::dispatch('inventory.inventory_source.delete.after', $id);
session()->flash('success', trans('admin::app.settings.inventory_sources.delete-success'));
diff --git a/packages/Webkul/Product/src/Helpers/GenerateProduct.php b/packages/Webkul/Product/src/Helpers/GenerateProduct.php
index 05ae61726..5d08d48fc 100644
--- a/packages/Webkul/Product/src/Helpers/GenerateProduct.php
+++ b/packages/Webkul/Product/src/Helpers/GenerateProduct.php
@@ -4,6 +4,7 @@ namespace Webkul\Product\Helpers;
use Webkul\Product\Repositories\ProductRepository as Product;
use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily;
+use Illuminate\Support\Str;
class GenerateProduct
{
@@ -41,7 +42,7 @@ class GenerateProduct
'code' => 'default'
]);
- $sku = str_random(10);
+ $sku = Str::random(10);
$data['sku'] = strtolower($sku);
$data['attribute_family_id'] = $attributeFamily->first()->id;
$data['type'] = 'simple';
@@ -51,23 +52,22 @@ class GenerateProduct
unset($data);
$faker = \Faker\Factory::create();
-
$date = date('Y-m-d');
$date = \Carbon\Carbon::parse($date);
$specialFrom = $date->toDateString();
$specialTo = $date->addDays(7)->toDateString();
- foreach ($attributes as $attribute) {
- if ($attribute->type == 'text') {
- if ($attribute->code == 'width' || $attribute->code == 'height' || $attribute->code == 'depth' || $attribute->code == 'weight') {
+ foreach ($attributes as $attribute) {
+ if ($attribute->type == 'text') {
+ if ($attribute->code == 'width' || $attribute->code == 'height' || $attribute->code == 'depth' || $attribute->code == 'weight') {
$data[$attribute->code] = $faker->randomNumber(3);
- } else if ($attribute->code == 'url_key') {
+ } else if ($attribute->code == 'url_key') {
$data[$attribute->code] = strtolower($sku);
} else if ($attribute->code != 'sku') {
$data[$attribute->code] = $faker->name;
} else {
- $data[$attribute->code] = $sku;
- }
+ $data[$attribute->code] = $sku;
+ }
} else if ($attribute->type == 'textarea') {
$data[$attribute->code] = $faker->text;
@@ -99,7 +99,7 @@ class GenerateProduct
} else {
$data[$attribute->code] = "";
}
- } else if ($attribute->type == 'multiselect') {
+ } else if ($attribute->type == 'multiselect') {
if ($options->count()) {
$option = $options->first()->id;
@@ -152,7 +152,7 @@ class GenerateProduct
];
$updated = $this->product->update($data, $product->id);
-
+
return $updated;
}
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
index 9134991d4..67174f16f 100755
--- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
@@ -310,7 +310,7 @@ class ProductController extends Controller
*/
public function sync()
{
- Event::fire('products.datagrid.sync', true);
+ Event::dispatch('products.datagrid.sync', true);
return redirect()->route('admin.catalog.products.index');
}
diff --git a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
index 105e6f7b5..10f51d987 100755
--- a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
@@ -45,7 +45,7 @@ class ReviewController extends Controller
/**
* Display a listing of the resource.
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function index()
{
@@ -56,7 +56,7 @@ class ReviewController extends Controller
* Show the form for editing the specified resource.
*
* @param int $id
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function edit($id)
{
@@ -73,11 +73,11 @@ class ReviewController extends Controller
*/
public function update($id)
{
- Event::fire('customer.review.update.before', $id);
+ Event::dispatch('customer.review.update.before', $id);
$this->productReviewRepository->update(request()->all(), $id);
- Event::fire('customer.review.update.after', $id);
+ Event::dispatch('customer.review.update.after', $id);
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Review']));
@@ -95,11 +95,11 @@ class ReviewController extends Controller
$productReview = $this->productReviewRepository->findOrFail($id);
try {
- Event::fire('customer.review.delete.before', $id);
+ Event::dispatch('customer.review.delete.before', $id);
$this->productReviewRepository->delete($id);
- Event::fire('customer.review.delete.after', $id);
+ Event::dispatch('customer.review.delete.after', $id);
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Review']));
@@ -127,11 +127,11 @@ class ReviewController extends Controller
foreach ($indexes as $key => $value) {
try {
- Event::fire('customer.review.delete.before', $value);
+ Event::dispatch('customer.review.delete.before', $value);
$this->productReviewRepository->delete($value);
- Event::fire('customer.review.delete.after', $value);
+ Event::dispatch('customer.review.delete.after', $value);
} catch(\Exception $e) {
$suppressFlash = true;
@@ -173,11 +173,11 @@ class ReviewController extends Controller
try {
if ($data['massaction-type'] == 'update') {
if ($data['update-options'] == 1) {
- Event::fire('customer.review.update.before', $value);
+ Event::dispatch('customer.review.update.before', $value);
$review->update(['status' => 'approved']);
- Event::fire('customer.review.update.after', $review);
+ Event::dispatch('customer.review.update.after', $review);
} else if ($data['update-options'] == 0) {
$review->update(['status' => 'pending']);
} else if ($data['update-options'] == 2) {
diff --git a/packages/Webkul/Product/src/Repositories/ProductBundleOptionProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductBundleOptionProductRepository.php
index 96ff07a2b..a05bc7415 100644
--- a/packages/Webkul/Product/src/Repositories/ProductBundleOptionProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductBundleOptionProductRepository.php
@@ -3,6 +3,7 @@
namespace Webkul\Product\Repositories;
use Webkul\Core\Eloquent\Repository;
+use Illuminate\Support\Str;
/**
* ProductBundleOptionProduct Repository
@@ -28,9 +29,9 @@ class ProductBundleOptionProductRepository extends Repository
if (isset($data['products'])) {
$this->setIsDefaultFlag($data);
-
+
foreach ($data['products'] as $bundleOptionProductId => $bundleOptionProductInputs) {
- if (str_contains($bundleOptionProductId, 'product_')) {
+ if (Str::contains($bundleOptionProductId, 'product_')) {
$this->create(array_merge([
'product_bundle_option_id' => $productBundleOption->id,
], $bundleOptionProductInputs));
@@ -56,14 +57,14 @@ class ProductBundleOptionProductRepository extends Repository
{
if (! count($data['products']))
return;
-
+
$haveIsDefaulFlag = false;
foreach ($data['products'] as $key => $product) {
if (isset($product['is_default']) && $product['is_default']) {
$haveIsDefaulFlag = true;
} else {
- $data['products'][$key]['is_default'] = 0;
+ $data['products'][$key]['is_default'] = 0;
}
}
diff --git a/packages/Webkul/Product/src/Repositories/ProductBundleOptionRepository.php b/packages/Webkul/Product/src/Repositories/ProductBundleOptionRepository.php
index 6c5208ccf..aa384a21a 100644
--- a/packages/Webkul/Product/src/Repositories/ProductBundleOptionRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductBundleOptionRepository.php
@@ -4,6 +4,7 @@ namespace Webkul\Product\Repositories;
use Illuminate\Container\Container as App;
use Webkul\Core\Eloquent\Repository;
+use Illuminate\Support\Str;
/**
* ProductBundleOption Repository
@@ -52,7 +53,7 @@ class ProductBundleOptionRepository extends Repository
if (isset($data['bundle_options'])) {
foreach ($data['bundle_options'] as $bundleOptionId => $bundleOptionInputs) {
- if (str_contains($bundleOptionId, 'option_')) {
+ if (Str::contains($bundleOptionId, 'option_')) {
$productBundleOption = $this->create(array_merge([
'product_id' => $product->id,
], $bundleOptionInputs));
diff --git a/packages/Webkul/Product/src/Repositories/ProductDownloadableLinkRepository.php b/packages/Webkul/Product/src/Repositories/ProductDownloadableLinkRepository.php
index 85543b73a..969c13844 100755
--- a/packages/Webkul/Product/src/Repositories/ProductDownloadableLinkRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductDownloadableLinkRepository.php
@@ -4,6 +4,7 @@ namespace Webkul\Product\Repositories;
use Illuminate\Support\Facades\Storage;
use Webkul\Core\Eloquent\Repository;
+use Illuminate\Support\Str;
/**
* Product Downloadable Link Reposotory
@@ -54,7 +55,7 @@ class ProductDownloadableLinkRepository extends Repository
if (isset($data['downloadable_links'])) {
foreach ($data['downloadable_links'] as $linkId => $data) {
- if (str_contains($linkId, 'link_')) {
+ if (Str::contains($linkId, 'link_')) {
$this->create(array_merge([
'product_id' => $product->id,
], $data));
diff --git a/packages/Webkul/Product/src/Repositories/ProductDownloadableSampleRepository.php b/packages/Webkul/Product/src/Repositories/ProductDownloadableSampleRepository.php
index 6fdf97401..748bef239 100755
--- a/packages/Webkul/Product/src/Repositories/ProductDownloadableSampleRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductDownloadableSampleRepository.php
@@ -4,6 +4,7 @@ namespace Webkul\Product\Repositories;
use Illuminate\Support\Facades\Storage;
use Webkul\Core\Eloquent\Repository;
+use Illuminate\Support\Str;
/**
* Product Downloadable Sample Reposotory
@@ -52,7 +53,7 @@ class ProductDownloadableSampleRepository extends Repository
if (isset($data['downloadable_samples'])) {
foreach ($data['downloadable_samples'] as $sampleId => $data) {
- if (str_contains($sampleId, 'sample_')) {
+ if (Str::contains($sampleId, 'sample_')) {
$this->create(array_merge([
'product_id' => $product->id,
], $data));
diff --git a/packages/Webkul/Product/src/Repositories/ProductGroupedProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductGroupedProductRepository.php
index 8558f9404..bcccbb05b 100644
--- a/packages/Webkul/Product/src/Repositories/ProductGroupedProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductGroupedProductRepository.php
@@ -4,6 +4,7 @@ namespace Webkul\Product\Repositories;
use Webkul\Core\Eloquent\Repository;
use Webkul\Product\Repositories\ProductRepository;
+use Illuminate\Support\Str;
/**
* Product Grouped Product Repository
@@ -29,7 +30,7 @@ class ProductGroupedProductRepository extends Repository
if (isset($data['links'])) {
foreach ($data['links'] as $linkId => $linkInputs) {
- if (str_contains($linkId, 'link_')) {
+ if (Str::contains($linkId, 'link_')) {
$this->create(array_merge([
'product_id' => $product->id,
], $linkInputs));
diff --git a/packages/Webkul/Product/src/Repositories/ProductImageRepository.php b/packages/Webkul/Product/src/Repositories/ProductImageRepository.php
index 1fa11edf9..d9cecef05 100755
--- a/packages/Webkul/Product/src/Repositories/ProductImageRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductImageRepository.php
@@ -4,6 +4,7 @@ namespace Webkul\Product\Repositories;
use Illuminate\Support\Facades\Storage;
use Webkul\Core\Eloquent\Repository;
+use Illuminate\Support\Str;
/**
* Product Image Reposotory
@@ -37,7 +38,7 @@ class ProductImageRepository extends Repository
$file = 'images.' . $imageId;
$dir = 'product/' . $product->id;
- if (str_contains($imageId, 'image_')) {
+ if (Str::contains($imageId, 'image_')) {
if (request()->hasFile($file)) {
$this->create([
'path' => request()->file($file)->store($dir),
diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index 6c868c2fb..5538d42ae 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -58,13 +58,13 @@ class ProductRepository extends Repository
*/
public function create(array $data)
{
- Event::fire('catalog.product.create.before');
+ Event::dispatch('catalog.product.create.before');
$typeInstance = app(config('product_types.' . $data['type'] . '.class'));
$product = $typeInstance->create($data);
- Event::fire('catalog.product.create.after', $product);
+ Event::dispatch('catalog.product.create.after', $product);
return $product;
}
@@ -77,7 +77,7 @@ class ProductRepository extends Repository
*/
public function update(array $data, $id, $attribute = "id")
{
- Event::fire('catalog.product.update.before', $id);
+ Event::dispatch('catalog.product.update.before', $id);
$product = $this->find($id);
@@ -86,7 +86,7 @@ class ProductRepository extends Repository
if (isset($data['channels']))
$product['channels'] = $data['channels'];
- Event::fire('catalog.product.update.after', $product);
+ Event::dispatch('catalog.product.update.after', $product);
return $product;
}
@@ -97,11 +97,11 @@ class ProductRepository extends Repository
*/
public function delete($id)
{
- Event::fire('catalog.product.delete.before', $id);
+ Event::dispatch('catalog.product.delete.before', $id);
parent::delete($id);
- Event::fire('catalog.product.delete.after', $id);
+ Event::dispatch('catalog.product.delete.after', $id);
}
/**
diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php
index 7d59d2279..38d884d4e 100644
--- a/packages/Webkul/Product/src/Type/Bundle.php
+++ b/packages/Webkul/Product/src/Type/Bundle.php
@@ -181,7 +181,7 @@ class Bundle extends AbstractType
}
if (! $haveRequiredOptions)
- $minPrice = min($minPrices);
+ $minPrice = count($minPrices) ? min($minPrices) : 0;
return $minPrice;
}
diff --git a/packages/Webkul/Product/src/Type/Configurable.php b/packages/Webkul/Product/src/Type/Configurable.php
index db2890f1d..0b88d3097 100644
--- a/packages/Webkul/Product/src/Type/Configurable.php
+++ b/packages/Webkul/Product/src/Type/Configurable.php
@@ -4,6 +4,7 @@ namespace Webkul\Product\Type;
use Webkul\Product\Models\ProductAttributeValue;
use Webkul\Product\Models\ProductFlat;
+use Illuminate\Support\Str;
/**
* Class Configurable.
@@ -96,7 +97,7 @@ class Configurable extends AbstractType
if (isset($data['variants'])) {
foreach ($data['variants'] as $variantId => $variantData) {
- if (str_contains($variantId, 'variant_')) {
+ if (Str::contains($variantId, 'variant_')) {
$permutation = [];
foreach ($product->super_attributes as $superAttribute) {
diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceItemRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceItemRepository.php
index 77667d98a..3f4977614 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceItemRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceItemRepository.php
@@ -52,7 +52,7 @@ class InvoiceItemRepository extends Repository
->whereIn('inventory_source_id', $data['invoice']->order->channel->inventory_sources()->pluck('id'))
->orderBy('qty', 'desc')
->get();
-
+
foreach ($inventories as $key => $inventory) {
if ($inventory->qty >= $data['qty']) {
$inventory->update(['qty' => $inventory->qty - $data['qty']]);
@@ -65,6 +65,6 @@ class InvoiceItemRepository extends Repository
}
}
- Event::fire('catalog.product.update.after', $data['product']);
+ Event::dispatch('catalog.product.update.after', $data['product']);
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index 2187b1e69..40f78fb44 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -94,7 +94,7 @@ class InvoiceRepository extends Repository
DB::beginTransaction();
try {
- Event::fire('sales.invoice.save.before', $data);
+ Event::dispatch('sales.invoice.save.before', $data);
$order = $this->orderRepository->find($data['order_id']);
@@ -162,7 +162,7 @@ class InvoiceRepository extends Repository
'product_type' => $childOrderItem->product_type,
'additional' => $childOrderItem->additional
]);
-
+
if ($childOrderItem->product && ! $childOrderItem->getTypeInstance()->isStockable() && $childOrderItem->getTypeInstance()->showQuantityBox()) {
$this->invoiceItemRepository->updateProductInventory([
'invoice' => $invoice,
@@ -194,7 +194,7 @@ class InvoiceRepository extends Repository
$this->orderRepository->updateOrderStatus($order);
- Event::fire('sales.invoice.save.after', $invoice);
+ Event::dispatch('sales.invoice.save.after', $invoice);
} catch (\Exception $e) {
DB::rollBack();
@@ -205,7 +205,7 @@ class InvoiceRepository extends Repository
return $invoice;
}
-
+
/**
* @param mixed $invoice
* @return mixed
diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
index 235a0a1a2..b5f6e75fa 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
@@ -73,7 +73,7 @@ class OrderRepository extends Repository
DB::beginTransaction();
try {
- Event::fire('checkout.order.save.before', $data);
+ Event::dispatch('checkout.order.save.before', $data);
if (isset($data['customer']) && $data['customer']) {
$data['customer_id'] = $data['customer']->id;
@@ -103,7 +103,7 @@ class OrderRepository extends Repository
$order->addresses()->create($data['billing_address']);
foreach ($data['items'] as $item) {
- Event::fire('checkout.order.orderitem.save.before', $data);
+ Event::dispatch('checkout.order.orderitem.save.before', $data);
$orderItem = $this->orderItemRepository->create(array_merge($item, ['order_id' => $order->id]));
@@ -117,10 +117,10 @@ class OrderRepository extends Repository
$this->downloadableLinkPurchasedRepository->saveLinks($orderItem, 'available');
- Event::fire('checkout.order.orderitem.save.after', $data);
+ Event::dispatch('checkout.order.orderitem.save.after', $data);
}
- Event::fire('checkout.order.save.after', $order);
+ Event::dispatch('checkout.order.save.after', $order);
} catch (\Exception $e) {
DB::rollBack();
@@ -145,7 +145,7 @@ class OrderRepository extends Repository
return false;
}
- Event::fire('sales.order.cancel.before', $order);
+ Event::dispatch('sales.order.cancel.before', $order);
foreach ($order->items as $item) {
if (! $item->qty_to_cancel) {
@@ -186,7 +186,7 @@ class OrderRepository extends Repository
$this->updateOrderStatus($order);
- Event::fire('sales.order.cancel.after', $order);
+ Event::dispatch('sales.order.cancel.after', $order);
return true;
}
diff --git a/packages/Webkul/Sales/src/Repositories/RefundRepository.php b/packages/Webkul/Sales/src/Repositories/RefundRepository.php
index 395182518..c309010b8 100644
--- a/packages/Webkul/Sales/src/Repositories/RefundRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/RefundRepository.php
@@ -91,7 +91,7 @@ class RefundRepository extends Repository
DB::beginTransaction();
try {
- Event::fire('sales.refund.save.before', $data);
+ Event::dispatch('sales.refund.save.before', $data);
$order = $this->orderRepository->find($data['order_id']);
@@ -165,7 +165,7 @@ class RefundRepository extends Repository
'product_type' => $childOrderItem->product_type,
'additional' => $childOrderItem->additional
]);
-
+
if ($childOrderItem->getTypeInstance()->isStockable() || $childOrderItem->getTypeInstance()->showQuantityBox())
$this->refundItemRepository->returnQtyToProductInventory($childOrderItem, $finalQty);
@@ -189,7 +189,7 @@ class RefundRepository extends Repository
$this->orderRepository->updateOrderStatus($order);
- Event::fire('sales.refund.save.after', $refund);
+ Event::dispatch('sales.refund.save.after', $refund);
} catch (\Exception $e) {
DB::rollBack();
diff --git a/packages/Webkul/Sales/src/Repositories/ShipmentItemRepository.php b/packages/Webkul/Sales/src/Repositories/ShipmentItemRepository.php
index 4659ffdc2..d7dc58429 100644
--- a/packages/Webkul/Sales/src/Repositories/ShipmentItemRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/ShipmentItemRepository.php
@@ -58,6 +58,6 @@ class ShipmentItemRepository extends Repository
$inventory->update(['qty' => $qty]);
- Event::fire('catalog.product.update.after', $data['product']);
+ Event::dispatch('catalog.product.update.after', $data['product']);
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
index 83076718d..9b77f3288 100755
--- a/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/ShipmentRepository.php
@@ -63,7 +63,7 @@ class ShipmentRepository extends Repository
parent::__construct($app);
}
-
+
/**
* Specify Model class name
*
@@ -82,9 +82,9 @@ class ShipmentRepository extends Repository
public function create(array $data)
{
DB::beginTransaction();
-
+
try {
- Event::fire('sales.shipment.save.before', $data);
+ Event::dispatch('sales.shipment.save.before', $data);
$order = $this->orderRepository->find($data['order_id']);
@@ -141,7 +141,7 @@ class ShipmentRepository extends Repository
'qty' => $finalQty,
'vendor_id' => isset($data['vendor_id']) ? $data['vendor_id'] : 0
]);
-
+
$this->orderItemRepository->update(['qty_shipped' => $child->qty_shipped + $finalQty], $child->id);
}
} else {
@@ -163,13 +163,13 @@ class ShipmentRepository extends Repository
$this->orderRepository->updateOrderStatus($order);
- Event::fire('sales.shipment.save.after', $shipment);
+ Event::dispatch('sales.shipment.save.after', $shipment);
} catch (\Exception $e) {
DB::rollBack();
throw $e;
}
-
+
DB::commit();
return $shipment;
diff --git a/packages/Webkul/Shop/src/Database/Migrations/2020_01_06_173505_alter_trigger_category_translations.php b/packages/Webkul/Shop/src/Database/Migrations/2020_01_06_173505_alter_trigger_category_translations.php
new file mode 100644
index 000000000..1bb0ca0bb
--- /dev/null
+++ b/packages/Webkul/Shop/src/Database/Migrations/2020_01_06_173505_alter_trigger_category_translations.php
@@ -0,0 +1,111 @@
+getTriggerBody();
+ $insertTrigger = <<< SQL
+ CREATE TRIGGER %s
+ BEFORE INSERT ON category_translations
+ FOR EACH ROW
+ BEGIN
+ $triggerBody
+ END;
+SQL;
+
+ $updateTrigger = <<< SQL
+ CREATE TRIGGER %s
+ BEFORE UPDATE ON category_translations
+ FOR EACH ROW
+ BEGIN
+ $triggerBody
+ END;
+SQL;
+
+ $this->dropTriggers();
+
+ DB::unprepared(sprintf($insertTrigger, self::TRIGGER_NAME_INSERT));
+ DB::unprepared(sprintf($updateTrigger, self::TRIGGER_NAME_UPDATE));
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ $this->dropTriggers();
+ }
+
+ /**
+ * Drop the triggers
+ */
+ private function dropTriggers()
+ {
+ DB::unprepared(sprintf('DROP TRIGGER IF EXISTS %s;', self::TRIGGER_NAME_INSERT));
+ DB::unprepared(sprintf('DROP TRIGGER IF EXISTS %s;', self::TRIGGER_NAME_UPDATE));
+ }
+
+ /**
+ * Returns trigger body as string
+ *
+ * @return string
+ */
+ private function getTriggerBody()
+ {
+ return <<
getProductBaseImage($review->product); ?>
-
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
index eefaacd02..0dfd7eda6 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
@@ -5,7 +5,7 @@
@stop
@section('seo')
- meta_description : str_limit(strip_tags($product->description), 120, '') }}"/>
+ meta_description : \Illuminate\Support\Str::limit(strip_tags($product->description), 120, '') }}"/>
@stop
@@ -52,7 +52,6 @@
@else
@endif
-
{!! view_render_event('bagisto.shop.products.view.quantity.after', ['product' => $product]) !!}
@@ -63,7 +62,7 @@
@include ('shop::products.view.grouped-products')
@include ('shop::products.view.bundle-options')
-
+
{!! view_render_event('bagisto.shop.products.view.description.before', ['product' => $product]) !!}
diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
index 97d4fcc51..dba75461c 100755
--- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
+++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
@@ -57,7 +57,7 @@ class TaxCategoryController extends Controller
/**
* Function to show the tax category form
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function show()
{
@@ -82,14 +82,14 @@ class TaxCategoryController extends Controller
'taxrates' => 'array|required'
]);
- Event::fire('tax.tax_category.create.before');
+ Event::dispatch('tax.tax_category.create.before');
$taxCategory = $this->taxCategoryRepository->create($data);
//attach the categories in the tax map table
$this->taxCategoryRepository->attachOrDetach($taxCategory, $data['taxrates']);
- Event::fire('tax.tax_category.create.after', $taxCategory);
+ Event::dispatch('tax.tax_category.create.after', $taxCategory);
session()->flash('success', trans('admin::app.settings.tax-categories.create-success'));
@@ -100,7 +100,7 @@ class TaxCategoryController extends Controller
* To show the edit form form the tax category
*
* @param int $id
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function edit($id)
{
@@ -127,11 +127,11 @@ class TaxCategoryController extends Controller
$data = request()->input();
- Event::fire('tax.tax_category.update.before', $id);
+ Event::dispatch('tax.tax_category.update.before', $id);
$taxCategory = $this->taxCategoryRepository->update($data, $id);
- Event::fire('tax.tax_category.update.after', $taxCategory);
+ Event::dispatch('tax.tax_category.update.after', $taxCategory);
if (! $taxCategory) {
session()->flash('error', trans('admin::app.settings.tax-categories.update-error'));
@@ -160,11 +160,11 @@ class TaxCategoryController extends Controller
$taxCategory = $this->taxCategoryRepository->findOrFail($id);
try {
- Event::fire('tax.tax_category.delete.before', $id);
+ Event::dispatch('tax.tax_category.delete.before', $id);
$this->taxCategoryRepository->delete($id);
- Event::fire('tax.tax_category.delete.after', $id);
+ Event::dispatch('tax.tax_category.delete.after', $id);
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Tax Category']));
diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
index e67ca4d39..0e321a40e 100755
--- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
+++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
@@ -47,7 +47,7 @@ class TaxRateController extends Controller
/**
* Display a listing resource for the available tax rates.
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function index() {
@@ -57,7 +57,7 @@ class TaxRateController extends Controller
/**
* Display a create form for tax rate
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function show()
{
@@ -88,11 +88,11 @@ class TaxRateController extends Controller
unset($data['zip_code']);
}
- Event::fire('tax.tax_rate.create.before');
+ Event::dispatch('tax.tax_rate.create.before');
$taxRate = $this->taxRateRepository->create($data);
- Event::fire('tax.tax_rate.create.after', $taxRate);
+ Event::dispatch('tax.tax_rate.create.after', $taxRate);
session()->flash('success', trans('admin::app.settings.tax-rates.create-success'));
@@ -102,7 +102,7 @@ class TaxRateController extends Controller
/**
* Show the edit form for the previously created tax rates.
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function edit($id)
{
@@ -128,11 +128,11 @@ class TaxRateController extends Controller
'tax_rate' => 'required|numeric|min:0.0001'
]);
- Event::fire('tax.tax_rate.update.before', $id);
+ Event::dispatch('tax.tax_rate.update.before', $id);
$taxRate = $this->taxRateRepository->update(request()->input(), $id);
- Event::fire('tax.tax_rate.update.after', $taxRate);
+ Event::dispatch('tax.tax_rate.update.after', $taxRate);
session()->flash('success', trans('admin::app.settings.tax-rates.update-success'));
@@ -150,11 +150,11 @@ class TaxRateController extends Controller
$taxRate = $this->taxRateRepository->findOrFail($id);
try {
- Event::fire('tax.tax_rate.delete.before', $id);
+ Event::dispatch('tax.tax_rate.delete.before', $id);
$this->taxRateRepository->delete($id);
- Event::fire('tax.tax_rate.delete.after', $id);
+ Event::dispatch('tax.tax_rate.delete.after', $id);
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Tax Rate']));
@@ -217,7 +217,7 @@ class TaxRateController extends Controller
foreach ($filtered as $position => $identifier) {
$message[] = trans('admin::app.export.duplicate-error', ['identifier' => $identifier, 'position' => $position]);
}
-
+
$finalMsg = implode(" ", $message);
session()->flash('error', $finalMsg);
diff --git a/packages/Webkul/Theme/src/ViewRenderEventManager.php b/packages/Webkul/Theme/src/ViewRenderEventManager.php
index 05f2bad89..50cc8aa12 100755
--- a/packages/Webkul/Theme/src/ViewRenderEventManager.php
+++ b/packages/Webkul/Theme/src/ViewRenderEventManager.php
@@ -31,7 +31,7 @@ class ViewRenderEventManager
{
$this->params = $params ?? [];
- Event::fire($eventName, $this);
+ Event::dispatch($eventName, $this);
return $this->templates;
}
@@ -77,7 +77,7 @@ class ViewRenderEventManager
public function render()
{
$string = "";
-
+
foreach ($this->templates as $template) {
if (view()->exists($template)) {
$string .= view($template , $this->params)->render();
@@ -86,7 +86,7 @@ class ViewRenderEventManager
$string .= $template;
}
}
-
+
return $string;
}
}
diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
index d09d3a7fc..c6f6b2094 100644
--- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php
+++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
@@ -425,7 +425,7 @@ abstract class DataGrid
$eventName = $className . '.' . $name;
- Event::fire($eventName, $this->invoker);
+ Event::dispatch($eventName, $this->invoker);
}
}
diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php
index aac7f7eb2..7a8c5a0aa 100755
--- a/packages/Webkul/User/src/Http/Controllers/RoleController.php
+++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php
@@ -45,7 +45,7 @@ class RoleController extends Controller
/**
* Display a listing of the resource.
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function index()
{
@@ -55,7 +55,7 @@ class RoleController extends Controller
/**
* Show the form for creating a new resource.
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function create()
{
@@ -74,11 +74,11 @@ class RoleController extends Controller
'permission_type' => 'required',
]);
- Event::fire('user.role.create.before');
+ Event::dispatch('user.role.create.before');
$role = $this->roleRepository->create(request()->all());
- Event::fire('user.role.create.after', $role);
+ Event::dispatch('user.role.create.after', $role);
session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Role']));
@@ -89,7 +89,7 @@ class RoleController extends Controller
* Show the form for editing the specified resource.
*
* @param int $id
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function edit($id)
{
@@ -111,11 +111,11 @@ class RoleController extends Controller
'permission_type' => 'required',
]);
- Event::fire('user.role.update.before', $id);
+ Event::dispatch('user.role.update.before', $id);
$role = $this->roleRepository->update(request()->all(), $id);
- Event::fire('user.role.update.after', $role);
+ Event::dispatch('user.role.update.after', $role);
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
@@ -138,11 +138,11 @@ class RoleController extends Controller
session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Role']));
} else {
try {
- Event::fire('user.role.delete.before', $id);
+ Event::dispatch('user.role.delete.before', $id);
$this->roleRepository->delete($id);
- Event::fire('user.role.delete.after', $id);
+ Event::dispatch('user.role.delete.after', $id);
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Role']));
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index 25e7a44fb..8a680fcc6 100755
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -61,7 +61,7 @@ class UserController extends Controller
/**
* Display a listing of the resource.
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function index()
{
@@ -71,7 +71,7 @@ class UserController extends Controller
/**
* Show the form for creating a new resource.
*
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function create()
{
@@ -93,11 +93,11 @@ class UserController extends Controller
if (isset($data['password']) && $data['password'])
$data['password'] = bcrypt($data['password']);
- Event::fire('user.admin.create.before');
+ Event::dispatch('user.admin.create.before');
$admin = $this->adminRepository->create($data);
- Event::fire('user.admin.create.after', $admin);
+ Event::dispatch('user.admin.create.after', $admin);
session()->flash('success', trans('admin::app.response.create-success', ['name' => 'User']));
@@ -108,7 +108,7 @@ class UserController extends Controller
* Show the form for editing the specified resource.
*
* @param integer $id
- * @return \Illuminate\View\View
+ * @return \Illuminate\View\View
*/
public function edit($id)
{
@@ -141,11 +141,11 @@ class UserController extends Controller
$data['status'] = 0;
}
- Event::fire('user.admin.update.before', $id);
+ Event::dispatch('user.admin.update.before', $id);
$admin = $this->adminRepository->update($data, $id);
- Event::fire('user.admin.update.after', $admin);
+ Event::dispatch('user.admin.update.after', $admin);
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User']));
@@ -156,7 +156,7 @@ class UserController extends Controller
* Remove the specified resource from storage.
*
* @param int $id
- * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
+ * @return \Illuminate\Http\JsonResponse|\Illuminate\View\View
*/
public function destroy($id)
{
@@ -165,7 +165,7 @@ class UserController extends Controller
if ($this->adminRepository->count() == 1) {
session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Admin']));
} else {
- Event::fire('user.admin.delete.before', $id);
+ Event::dispatch('user.admin.delete.before', $id);
if (auth()->guard('admin')->user()->id == $id) {
return view('admin::customers.confirm-password');
@@ -176,7 +176,7 @@ class UserController extends Controller
session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Admin']));
- Event::fire('user.admin.delete.after', $id);
+ Event::dispatch('user.admin.delete.after', $id);
return response()->json(['message' => true], 200);
} catch (Exception $e) {
@@ -202,11 +202,11 @@ class UserController extends Controller
} else {
$id = auth()->guard('admin')->user()->id;
- Event::fire('user.admin.delete.before', $id);
+ Event::dispatch('user.admin.delete.before', $id);
$this->adminRepository->delete($id);
- Event::fire('user.admin.delete.after', $id);
+ Event::dispatch('user.admin.delete.after', $id);
session()->flash('success', trans('admin::app.users.users.delete-success'));
diff --git a/public/installer/Classes/Requirement.php b/public/installer/Classes/Requirement.php
index e033d4ddf..20bd46793 100755
--- a/public/installer/Classes/Requirement.php
+++ b/public/installer/Classes/Requirement.php
@@ -80,7 +80,7 @@ class Requirement {
*
* @var _minPhpVersion
*/
- $_minPhpVersion = '7.1.17';
+ $_minPhpVersion = '7.2.0';
$currentPhpVersion = $this->getPhpVersionInfo();
$supported = false;
diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php
new file mode 100644
index 000000000..5c586db96
--- /dev/null
+++ b/resources/views/errors/401.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Unauthorized'))
+@section('code', '401')
+@section('message', __('Unauthorized'))
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
new file mode 100644
index 000000000..a5506f01f
--- /dev/null
+++ b/resources/views/errors/403.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Forbidden'))
+@section('code', '403')
+@section('message', __($exception->getMessage() ?: 'Forbidden'))
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
new file mode 100644
index 000000000..7549540d8
--- /dev/null
+++ b/resources/views/errors/404.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Not Found'))
+@section('code', '404')
+@section('message', __('Not Found'))
diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.php
new file mode 100644
index 000000000..c09216e21
--- /dev/null
+++ b/resources/views/errors/419.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Page Expired'))
+@section('code', '419')
+@section('message', __('Page Expired'))
diff --git a/resources/views/errors/429.blade.php b/resources/views/errors/429.blade.php
new file mode 100644
index 000000000..f01b07b8e
--- /dev/null
+++ b/resources/views/errors/429.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Too Many Requests'))
+@section('code', '429')
+@section('message', __('Too Many Requests'))
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
new file mode 100644
index 000000000..d9e95d9b9
--- /dev/null
+++ b/resources/views/errors/500.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Server Error'))
+@section('code', '500')
+@section('message', __('Server Error'))
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
new file mode 100644
index 000000000..acd38100a
--- /dev/null
+++ b/resources/views/errors/503.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Service Unavailable'))
+@section('code', '503')
+@section('message', __($exception->getMessage() ?: 'Service Unavailable'))
diff --git a/resources/views/errors/illustrated-layout.blade.php b/resources/views/errors/illustrated-layout.blade.php
new file mode 100644
index 000000000..64eb7cbb8
--- /dev/null
+++ b/resources/views/errors/illustrated-layout.blade.php
@@ -0,0 +1,486 @@
+
+
+
+
+
+
+ @yield('title')
+
+
+
+
+
+
+
+
+
+ @yield('title')
+
+
+
+
+
+
+
+
+
+ @yield('title')
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php
new file mode 100644
index 000000000..2c51d4f35
--- /dev/null
+++ b/resources/views/errors/layout.blade.php
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+ @yield('image')
+
+
+
+
+
diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php
new file mode 100644
index 000000000..b63ac2b37
--- /dev/null
+++ b/resources/views/errors/minimal.blade.php
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/vendor/mail/text/button.blade.php b/resources/views/vendor/mail/text/button.blade.php
new file mode 100644
index 000000000..97444ebdc
--- /dev/null
+++ b/resources/views/vendor/mail/text/button.blade.php
@@ -0,0 +1 @@
+{{ $slot }}: {{ $url }}
diff --git a/resources/views/vendor/mail/text/footer.blade.php b/resources/views/vendor/mail/text/footer.blade.php
new file mode 100644
index 000000000..3338f620e
--- /dev/null
+++ b/resources/views/vendor/mail/text/footer.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/resources/views/vendor/mail/text/header.blade.php b/resources/views/vendor/mail/text/header.blade.php
new file mode 100644
index 000000000..aaa3e5754
--- /dev/null
+++ b/resources/views/vendor/mail/text/header.blade.php
@@ -0,0 +1 @@
+[{{ $slot }}]({{ $url }})
diff --git a/resources/views/vendor/mail/text/layout.blade.php b/resources/views/vendor/mail/text/layout.blade.php
new file mode 100644
index 000000000..9378baa07
--- /dev/null
+++ b/resources/views/vendor/mail/text/layout.blade.php
@@ -0,0 +1,9 @@
+{!! strip_tags($header) !!}
+
+{!! strip_tags($slot) !!}
+@isset($subcopy)
+
+{!! strip_tags($subcopy) !!}
+@endisset
+
+{!! strip_tags($footer) !!}
diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php
new file mode 100644
index 000000000..1ae9ed8f1
--- /dev/null
+++ b/resources/views/vendor/mail/text/message.blade.php
@@ -0,0 +1,27 @@
+@component('mail::layout')
+ {{-- Header --}}
+ @slot('header')
+ @component('mail::header', ['url' => config('app.url')])
+ {{ config('app.name') }}
+ @endcomponent
+ @endslot
+
+ {{-- Body --}}
+ {{ $slot }}
+
+ {{-- Subcopy --}}
+ @isset($subcopy)
+ @slot('subcopy')
+ @component('mail::subcopy')
+ {{ $subcopy }}
+ @endcomponent
+ @endslot
+ @endisset
+
+ {{-- Footer --}}
+ @slot('footer')
+ @component('mail::footer')
+ © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+ @endcomponent
+ @endslot
+@endcomponent
diff --git a/resources/views/vendor/mail/text/panel.blade.php b/resources/views/vendor/mail/text/panel.blade.php
new file mode 100644
index 000000000..3338f620e
--- /dev/null
+++ b/resources/views/vendor/mail/text/panel.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/resources/views/vendor/mail/text/promotion.blade.php b/resources/views/vendor/mail/text/promotion.blade.php
new file mode 100644
index 000000000..3338f620e
--- /dev/null
+++ b/resources/views/vendor/mail/text/promotion.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/resources/views/vendor/mail/text/promotion/button.blade.php b/resources/views/vendor/mail/text/promotion/button.blade.php
new file mode 100644
index 000000000..aaa3e5754
--- /dev/null
+++ b/resources/views/vendor/mail/text/promotion/button.blade.php
@@ -0,0 +1 @@
+[{{ $slot }}]({{ $url }})
diff --git a/resources/views/vendor/mail/text/subcopy.blade.php b/resources/views/vendor/mail/text/subcopy.blade.php
new file mode 100644
index 000000000..3338f620e
--- /dev/null
+++ b/resources/views/vendor/mail/text/subcopy.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/resources/views/vendor/mail/text/table.blade.php b/resources/views/vendor/mail/text/table.blade.php
new file mode 100644
index 000000000..3338f620e
--- /dev/null
+++ b/resources/views/vendor/mail/text/table.blade.php
@@ -0,0 +1 @@
+{{ $slot }}
diff --git a/tests/trigger/Shop/DatabaseLogicCest.php b/tests/trigger/Shop/DatabaseLogicCest.php
index 3899c4fc3..bd446683e 100644
--- a/tests/trigger/Shop/DatabaseLogicCest.php
+++ b/tests/trigger/Shop/DatabaseLogicCest.php
@@ -6,6 +6,7 @@ use UnitTester;
use Webkul\Category\Models\Category;
use Faker\Factory;
use Illuminate\Support\Facades\DB;
+use Webkul\Category\Models\CategoryTranslation;
use Webkul\Core\Models\Locale;
class DatabaseLogicCest
@@ -35,10 +36,18 @@ class DatabaseLogicCest
public function testGetUrlPathOfCategory(UnitTester $I)
{
+ $rootCategoryTranslation = $I->grabRecord(CategoryTranslation::class, [
+ 'slug' => 'root',
+ 'locale' => 'en',
+ ]);
+ $rootCategory = $I->grabRecord(Category::class, [
+ 'id' => $rootCategoryTranslation->category_id,
+ ]);
+
$parentCategoryName = $this->faker->word;
$parentCategoryAttributes = [
- 'parent_id' => 1,
+ 'parent_id' => $rootCategory->id,
'position' => 1,
'status' => 1,
$this->localeEn->code => [
@@ -55,7 +64,8 @@ class DatabaseLogicCest
],
];
- $parentCategory = $I->have(Category::class, $parentCategoryAttributes);
+ $parentCategory = $I->make(Category::class, $parentCategoryAttributes)->first();
+ $rootCategory->prependNode($parentCategory);
$I->assertNotNull($parentCategory);
$categoryName = $this->faker->word;
@@ -77,7 +87,8 @@ class DatabaseLogicCest
],
];
- $category = $I->have(Category::class, $categoryAttributes);
+ $category = $I->make(Category::class, $categoryAttributes)->first();
+ $parentCategory->prependNode($category);
$I->assertNotNull($category);
$sqlStoredFunction = 'SELECT get_url_path_of_category(:category_id, :locale_code) AS url_path;';
@@ -97,5 +108,27 @@ class DatabaseLogicCest
$expectedUrlPath = strtolower($parentCategoryName) . '/' . strtolower($categoryName);
$I->assertEquals($expectedUrlPath, $urlPathQueryResult->url_path);
+
+ $root2Category = $I->make(Category::class, [
+ 'position' => 1,
+ 'status' => 1,
+ 'parent_id' => null,
+ $this->localeEn->code => [
+ 'name' => $this->faker->word,
+ 'slug' => strtolower($this->faker->word),
+ 'description' => $this->faker->word,
+ 'locale_id' => $this->localeEn->id,
+ ],
+ ])->first();
+ $root2Category->save();
+
+ $I->assertNull($root2Category->refresh()->parent_id);
+
+ $urlPathQueryResult = DB::selectOne($sqlStoredFunction, [
+ 'category_id' => $root2Category->id,
+ 'locale_code' => $this->localeEn->code,
+ ]);
+ $I->assertNotNull($urlPathQueryResult->url_path);
+ $I->assertEquals('', $urlPathQueryResult->url_path);
}
}
diff --git a/tests/trigger/Shop/TriggerCest.php b/tests/trigger/Shop/TriggerCest.php
index 89bdc542e..2be0f75d0 100644
--- a/tests/trigger/Shop/TriggerCest.php
+++ b/tests/trigger/Shop/TriggerCest.php
@@ -14,12 +14,19 @@ class TriggerCest
private $parentCategory;
private $category;
+ private $root2Category;
+ private $childOfRoot2Category;
private $parentCategoryAttributes;
private $categoryAttributes;
+ private $root2CategoryAttributes;
+ private $childOfRoot2CategoryAttributes;
private $parentCategoryName;
private $categoryName;
+ private $root2CategoryName;
+ private $childOfRoot2CategoryName;
+
/** @var Locale $localeEn */
private $localeEn;
@@ -30,8 +37,18 @@ class TriggerCest
{
$this->faker = Factory::create();
+ $rootCategoryTranslation = $I->grabRecord(CategoryTranslation::class, [
+ 'slug' => 'root',
+ 'locale' => 'en',
+ ]);
+ $rootCategory = $I->grabRecord(Category::class, [
+ 'id' => $rootCategoryTranslation->category_id,
+ ]);
+
$this->parentCategoryName = $this->faker->word;
$this->categoryName = $this->faker->word . $this->faker->randomDigit;
+ $this->root2CategoryName = $this->faker->word . $this->faker->randomDigit;
+ $this->childOfRoot2CategoryName = $this->faker->word . $this->faker->randomDigit;
$this->localeEn = $I->grabRecord(Locale::class, [
'code' => 'en',
@@ -42,7 +59,7 @@ class TriggerCest
]);
$this->parentCategoryAttributes = [
- 'parent_id' => 1,
+ 'parent_id' => $rootCategory->id,
'position' => 1,
'status' => 1,
$this->localeEn->code => [
@@ -59,7 +76,8 @@ class TriggerCest
],
];
- $this->parentCategory = $I->have(Category::class, $this->parentCategoryAttributes);
+ $this->parentCategory = $I->make(Category::class, $this->parentCategoryAttributes)->first();
+ $rootCategory->appendNode($this->parentCategory);
$I->assertNotNull($this->parentCategory);
$this->categoryAttributes = [
@@ -80,8 +98,58 @@ class TriggerCest
],
];
- $this->category = $I->have(Category::class, $this->categoryAttributes);
+ $this->category = $I->make(Category::class, $this->categoryAttributes)->first();
+ $this->parentCategory->appendNode($this->category);
$I->assertNotNull($this->category);
+
+
+ $this->root2CategoryAttributes = [
+ 'position' => 1,
+ 'status' => 1,
+ 'parent_id' => null,
+ $this->localeEn->code => [
+ 'name' => $this->root2CategoryName,
+ 'slug' => strtolower($this->root2CategoryName),
+ 'description' => $this->root2CategoryName,
+ 'locale_id' => $this->localeEn->id,
+ ],
+ $this->localeDe->code => [
+ 'name' => $this->root2CategoryName,
+ 'slug' => strtolower($this->root2CategoryName),
+ 'description' => $this->root2CategoryName,
+ 'locale_id' => $this->localeDe->id,
+ ],
+ ];
+
+ $this->root2Category = $I->make(Category::class, $this->root2CategoryAttributes)->first();
+ $this->root2Category->save();
+
+ $I->assertNotNull($this->root2Category);
+ $I->assertNull($this->root2Category->parent_id);
+ $I->assertGreaterThan($rootCategory->_rgt, $this->root2Category->_lft);
+
+ $this->childOfRoot2CategoryAttributes = [
+ 'position' => 1,
+ 'status' => 1,
+ 'parent_id' => $this->root2Category->id,
+ $this->localeEn->code => [
+ 'name' => $this->childOfRoot2CategoryName,
+ 'slug' => strtolower($this->childOfRoot2CategoryName),
+ 'description' => $this->childOfRoot2CategoryName,
+ 'locale_id' => $this->localeEn->id,
+ ],
+ $this->localeDe->code => [
+ 'name' => $this->childOfRoot2CategoryName,
+ 'slug' => strtolower($this->childOfRoot2CategoryName),
+ 'description' => $this->childOfRoot2CategoryName,
+ 'locale_id' => $this->localeDe->id,
+ ],
+ ];
+
+ $this->childOfRoot2Category = $I->make(Category::class, $this->childOfRoot2CategoryAttributes)->first();
+ $this->root2Category->appendNode($this->childOfRoot2Category);
+
+ $I->assertNotNull($this->childOfRoot2Category);
}
public function testInsertTriggerOnCategoryTranslationsTable(UnitTester $I)
@@ -111,6 +179,25 @@ class TriggerCest
'locale' => $this->localeDe->code,
'url_path' => strtolower($this->parentCategoryName) . '/' . strtolower($this->categoryName)
]);
+ $I->seeRecord(CategoryTranslation::class, [
+ 'category_id' => $this->root2Category->id,
+ 'name' => $this->root2CategoryName,
+ 'locale' => $this->localeEn->code,
+ 'url_path' => '',
+ ]);
+
+ $I->seeRecord(CategoryTranslation::class, [
+ 'category_id' => $this->childOfRoot2Category->id,
+ 'name' => $this->childOfRoot2CategoryName,
+ 'locale' => $this->localeDe->code,
+ 'url_path' => strtolower($this->childOfRoot2CategoryName)
+ ]);
+ $I->seeRecord(CategoryTranslation::class, [
+ 'category_id' => $this->childOfRoot2Category->id,
+ 'name' => $this->childOfRoot2CategoryName,
+ 'locale' => $this->localeEn->code,
+ 'url_path' => strtolower($this->childOfRoot2CategoryName)
+ ]);
}
public function testUpdateTriggersOnCategoryTranslationsTable(UnitTester $I)
diff --git a/tests/unit/Category/CategoryCest.php b/tests/unit/Category/CategoryCest.php
index c3c2779b0..9a21c064c 100644
--- a/tests/unit/Category/CategoryCest.php
+++ b/tests/unit/Category/CategoryCest.php
@@ -15,6 +15,8 @@ class CategoryCest
/** @var Locale $localeEn */
private $localeEn;
+ /** @var Category $rootCategory */
+ private $rootCategory;
/** @var Category $category */
private $category;
/** @var Category $childCategory */
@@ -22,6 +24,7 @@ class CategoryCest
/** @var Category $grandChildCategory */
private $grandChildCategory;
+ private $rootCategoryAttributes;
private $categoryAttributes;
private $childCategoryAttributes;
private $grandChildCategoryAttributes;
@@ -34,8 +37,16 @@ class CategoryCest
'code' => 'en',
]);
+ $rootCategoryTranslation = $I->grabRecord(CategoryTranslation::class, [
+ 'slug' => 'root',
+ 'locale' => 'en',
+ ]);
+ $this->rootCategory = $I->grabRecord(Category::class, [
+ 'id' => $rootCategoryTranslation->category_id,
+ ]);
+
$this->categoryAttributes = [
- 'parent_id' => 1,
+ 'parent_id' => $this->rootCategory->id,
'position' => 0,
'status' => 1,
$this->localeEn->code => [
@@ -46,9 +57,9 @@ class CategoryCest
],
];
- $this->category = $I->have(Category::class, $this->categoryAttributes);
+ $this->category = $I->make(Category::class, $this->categoryAttributes)->first();
+ $this->rootCategory->prependNode($this->category);
$I->assertNotNull($this->category);
- //return true;
$I->seeRecord(CategoryTranslation::class, [
'category_id' => $this->category->id,
@@ -67,7 +78,8 @@ class CategoryCest
'locale_id' => $this->localeEn->id,
],
];
- $this->childCategory = $I->have(Category::class, $this->childCategoryAttributes);
+ $this->childCategory = $I->make(Category::class, $this->childCategoryAttributes)->first();
+ $this->category->prependNode($this->childCategory);
$I->assertNotNull($this->childCategory);
$expectedUrlPath = $this->category->slug . '/' . $this->childCategory->slug;
@@ -88,7 +100,8 @@ class CategoryCest
'locale_id' => $this->localeEn->id,
],
];
- $this->grandChildCategory = $I->have(Category::class, $this->grandChildCategoryAttributes);
+ $this->grandChildCategory = $I->make(Category::class, $this->grandChildCategoryAttributes)->first();
+ $this->childCategory->prependNode($this->grandChildCategory);
$I->assertNotNull($this->grandChildCategory);
$expectedUrlPath .= '/' . $this->grandChildCategory->slug;
@@ -104,7 +117,6 @@ class CategoryCest
public function testChildUrlPathIsUpdatedOnParentUpdate(UnitTester $I)
{
- //return true;
$newCategorySlug = $this->faker->slug;
$this->categoryAttributes[$this->localeEn->code]['slug'] = $newCategorySlug;
@@ -138,5 +150,31 @@ class CategoryCest
'locale' => $this->localeEn->code,
'url_path' => $expectedUrlPath,
]);
+
+ $I->amGoingTo('test if the url_path attribute is available in the model');
+ $this->grandChildCategory->refresh();
+ $I->assertEquals($expectedUrlPath, $this->grandChildCategory->url_path);
+ }
+
+ public function testGetRootCategory(UnitTester $I)
+ {
+ $I->wantTo('test rootCategory attribute of a category');
+ $rootCategory = $this->grandChildCategory->getRootCategory();
+
+ $I->assertNotNull($rootCategory);
+ $I->assertEquals($rootCategory->id, $this->rootCategory->id);
+ }
+
+ public function testGetPathCategories(UnitTester $I)
+ {
+ $I->wantTo('test getPathCategories is returning the correct categories in the correct order');
+ $I->amGoingTo('get all categories wihin the path of the grand child category');
+ $pathCategories = $this->grandChildCategory->getPathCategories();
+
+ $I->assertCount(4, $pathCategories);
+ $I->assertEquals($pathCategories[0]->id, $this->rootCategory->id);
+ $I->assertEquals($pathCategories[1]->id, $this->category->id);
+ $I->assertEquals($pathCategories[2]->id, $this->childCategory->id);
+ $I->assertEquals($pathCategories[3]->id, $this->grandChildCategory->id);
}
}
+ @yield('code')
+
+
+
+