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

Cart rule and catalog rule updated for laravel 6.0

This commit is contained in:
Jitendra Singh 2020-01-21 15:51:12 +05:30
parent 50bf92d658
commit a606c06e11
6 changed files with 591 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

876
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

8
packages/Webkul/CMS/src/Repositories/CmsRepository.php
View File

@ -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;
}

12
packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php
View File

@ -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']));

12
packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php
View File

@ -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']));

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

@ -615,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();
@ -658,7 +658,7 @@ class Cart {
$cart->save();
Event::fire('checkout.cart.collect.totals.after', $cart);
Event::dispatch('checkout.cart.collect.totals.after', $cart);
}
/**

8
packages/Webkul/Core/src/Repositories/SliderRepository.php
View File

@ -56,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;
@ -88,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;
}
@ -99,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;
@ -131,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;
}