From a8cdf29fc7aed023d982b802e09845ba39d66857 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 1 Feb 2021 15:35:04 +0530 Subject: [PATCH 1/4] Issue #3572, fixes percentage for 2 decimal values --- packages/Webkul/Product/src/Type/AbstractType.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php index 083c38c57..eb286c93f 100644 --- a/packages/Webkul/Product/src/Type/AbstractType.php +++ b/packages/Webkul/Product/src/Type/AbstractType.php @@ -959,7 +959,7 @@ abstract class AbstractType if ($haveOffers) { foreach ($customerGroupPrices as $key => $customerGroupPrice) { - if ($key > 0) { + if ($customerGroupPrice && $customerGroupPrice->qty > 1) { array_push($offerLines, $this->getOfferLines($customerGroupPrice)); } } @@ -985,7 +985,7 @@ abstract class AbstractType public function getOfferLines($customerGroupPrice) { $price = $this->getCustomerGroupPrice($this->product, $customerGroupPrice->qty); - $discount = (($this->product->price - $price) * 100) / ($this->product->price); + $discount = number_format((($this->product->price - $price) * 100) / ($this->product->price), 2); $offerLines = trans('shop::app.products.offers', ['qty' => $customerGroupPrice->qty, 'price' => core()->currency($price), 'discount' => $discount]); From 4b1109823b989361248b3eaf82ef7c8f8b6725c2 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 1 Feb 2021 16:16:05 +0530 Subject: [PATCH 2/4] Issue #4533, set scheduler for daily basis --- app/Console/Kernel.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 2cf59a56a..7610f8751 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -25,6 +25,8 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { $schedule->command('booking:cron')->dailyAt('3:00'); + + $schedule->command('campaign:process')->daily(); } /** @@ -36,6 +38,7 @@ class Kernel extends ConsoleKernel { $this->load(__DIR__.'/Commands'); $this->load(__DIR__.'/../../packages/Webkul/Core/src/Console/Commands'); + $this->load(__DIR__.'/../../packages/Webkul/Marketing/src/Console/Commands'); require base_path('routes/console.php'); } From c9d09731e1446629b0ffba75b484b3f67d982295 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 1 Feb 2021 16:40:13 +0530 Subject: [PATCH 3/4] chnage according to comment --- app/Console/Kernel.php | 3 --- .../Marketing/src/Providers/MarketingServiceProvider.php | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 7610f8751..2cf59a56a 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -25,8 +25,6 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { $schedule->command('booking:cron')->dailyAt('3:00'); - - $schedule->command('campaign:process')->daily(); } /** @@ -38,7 +36,6 @@ class Kernel extends ConsoleKernel { $this->load(__DIR__.'/Commands'); $this->load(__DIR__.'/../../packages/Webkul/Core/src/Console/Commands'); - $this->load(__DIR__.'/../../packages/Webkul/Marketing/src/Console/Commands'); require base_path('routes/console.php'); } diff --git a/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php b/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php index ba2ffaf37..34cad0cf8 100644 --- a/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php +++ b/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php @@ -4,6 +4,7 @@ namespace Webkul\Marketing\Providers; use Illuminate\Support\ServiceProvider; use Webkul\Marketing\Console\Commands\EmailsCommand; +use Illuminate\Console\Scheduling\Schedule; class MarketingServiceProvider extends ServiceProvider { @@ -17,6 +18,10 @@ class MarketingServiceProvider extends ServiceProvider $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); + + $this->callAfterResolving(Schedule::class, function (Schedule $schedule) { + $schedule->command('comain:process')->daily(); + }); } /** From 1f6f7a3bac046becec2089b81ba5af5ec3489c95 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 1 Feb 2021 16:44:46 +0530 Subject: [PATCH 4/4] corrected spelling --- .../Webkul/Marketing/src/Providers/MarketingServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php b/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php index 34cad0cf8..d5f19b8ea 100644 --- a/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php +++ b/packages/Webkul/Marketing/src/Providers/MarketingServiceProvider.php @@ -20,7 +20,7 @@ class MarketingServiceProvider extends ServiceProvider $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); $this->callAfterResolving(Schedule::class, function (Schedule $schedule) { - $schedule->command('comain:process')->daily(); + $schedule->command('campaign:process')->daily(); }); }