gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates to 03-2025

Browse source
This commit is contained in:
Kevin Adametz 2025-04-01 10:39:21 +02:00
parent 6167273a48
commit 9b54eb0512
348 changed files with 34535 additions and 5774 deletions
Download patch file Download diff file Expand all files Collapse all files

87
app/Cron/CronController.php
View file

@ -1,87 +0,0 @@
<?php
namespace App\Cron;
use App\User;
use App\Models\UserBusiness;
use App\Services\HTMLHelper;
use App\Models\UserCreditItem;
use App\Repositories\CreditRepository;
class UserCheckPaymentsAccounts
{
private $month;
private $year;
public function __construct($month, $year)
{
$this->month = $month;
$this->year = $year;
}
public function getUserBusinessByMonthYear(){
return UserBusiness::select('user_businesses.*')
->where('user_businesses.month', '=', $this->month)
->where('user_businesses.year', '=', $this->year)
->where(function($q) {
return $q->where('user_businesses.commission_team_total', '>', 0)
->orWhere('user_businesses.commission_shop_sales', '>', 0);
})
->get();
}
public function addUserCreditItem($userBusiness)
{
$date = HTMLHelper::getMonth($userBusiness->month).' '.$userBusiness->year;
if($userBusiness->commission_shop_sales > 0){
if($this->hasNotUserCreditItem($userBusiness, 1)){
UserCreditItem::create([
'user_id' => $userBusiness->user_id,
'user_business_id' => $userBusiness->id,
'credit' => $userBusiness->commission_shop_sales,
'message' => 'Provision Shop '.$date,
'status' => 1,
]);
}
}
if($userBusiness->commission_team_total > 0){
if($this->hasNotUserCreditItem($userBusiness, 2)){
UserCreditItem::create([
'user_id' => $userBusiness->user_id,
'user_business_id' => $userBusiness->id,
'credit' => $userBusiness->commission_team_total,
'message' => 'Provision Team '.$date,
'status' => 2,
]);
}
}
return $userBusiness;
}
public function getUserCreditItemUsersByMonthYear(){
return UserCreditItem::select('user_credit_items.*')
->where('paid', '=', false)
->groupBy('user_id')
->get();
}
public function makeCreditPaymentPDF($user_id, $credit_send_mail)
{
//$user_id = 2;
$user = User::findOrFail($user_id);
$data = [];
if($credit_send_mail){
$data['credit_send_mail'] = true;
}
$credit_repo = new CreditRepository($user);
return $credit_repo->create($data);
}
private function hasNotUserCreditItem($userBusiness, $status){
return (UserCreditItem::where('user_business_id', $userBusiness->id)
->where('user_id', $userBusiness->user_id)->where('status', $status)->count() > 0) ? false : true;
}
}

25
app/Cron/UserCheckPaymentsAccounts.php
View file

@ -27,27 +27,28 @@ class UserCheckPaymentsAccounts
> 0 deaktiv = reminder_deaktiv //status 35
*/
public static function userReminderPayments(User $user){
public static function userReminderPayments(User $user, $dev){
//35 reminder_deaktiv
if(!$user->isActiveAccount()){ // payment_account gt now
return self::checkIsReminderSend($user, 35);
return self::checkIsReminderSend($user, 35, $dev);
}
//34 reminder_last
if($user->daysActiveAccount() <= config('main.remind_last_days')){
return self::checkIsReminderSend($user, 34);
return self::checkIsReminderSend($user, 34, $dev);
}
//33 reminder_sec
if($user->daysActiveAccount() <= config('main.remind_sec_days')){
return self::checkIsReminderSend($user, 33);
return self::checkIsReminderSend($user, 33, $dev);
}
//31 reminder_first
if($user->daysActiveAccount() > config('main.remind_sec_days')){
return self::checkIsReminderSend($user, 31);
return self::checkIsReminderSend($user, 31, $dev);
}
return 0;
}
private static function checkIsReminderSend(User $user, $status){
private static function checkIsReminderSend(User $user, $status, $dev){
$isSend = UserHistory::whereUserId($user->id)
->whereAction('reminder_payments')
@ -58,7 +59,11 @@ class UserCheckPaymentsAccounts
if($isSend){
return 0;
}
$referenz = self::sendReminderMail($user, $status);
if($dev){
$referenz = 0;
}else{
$referenz = self::sendReminderMail($user, $status);
}
UserHistory::create(['user_id' => $user->id, 'action'=>'reminder_payments', 'referenz'=>$referenz, 'identifier'=>$user->payment_account, 'status'=>$status]);
return $status;
@ -105,9 +110,9 @@ class UserCheckPaymentsAccounts
]);
try{
if($status >= 34){
Mail::to($user->email)->bcc(config('app.info_mail'))->send(new MailCustomMessage($user, $data, $sender, false));
//Mail::to($user->email)->bcc(config('app.info_mail'))->send(new MailCustomMessage($user, $data, $sender, false));
}else{
Mail::to($user->email)->send(new MailCustomMessage($user, $data, $sender, false));
//Mail::to($user->email)->send(new MailCustomMessage($user, $data, $sender, false));
}
}
catch(\Exception $e){
@ -129,6 +134,8 @@ class UserCheckPaymentsAccounts
/*public function checkConfirmation()
{
User Register sind in der DB UserRegister, erst bei bestätigung wird es in die User DB übertragen
$now = date('Y-m-d H:i:s');
$next = date('Y-m-d H:i:s', strtotime('+3 week'));